From 9988f4033dd0af225e65b631e585032c57e15e11 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 18 Jun 2017 16:24:18 +1200
Subject: Break plenv stuff into its own target

---
 Makefile                 |  7 ++++++-
 plenv/profile.d/plenv.sh |  5 +++++
 plenv/shrc.d/plenv.sh    | 17 +++++++++++++++++
 sh/profile.d/plenv.sh    |  5 -----
 sh/shrc.d/plenv.sh       | 17 -----------------
 5 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 plenv/profile.d/plenv.sh
 create mode 100644 plenv/shrc.d/plenv.sh
 delete mode 100644 sh/profile.d/plenv.sh
 delete mode 100644 sh/shrc.d/plenv.sh

diff --git a/Makefile b/Makefile
index 65e85ffc..36273e54 100644
--- a/Makefile
+++ b/Makefile
@@ -389,7 +389,7 @@ install-less:
 
 install-mpd: install-sh
 	mkdir -p -- $(HOME)/.profile.d $(HOME)/.mpd $(HOME)/.mpd/playlists
-	cp -p .. mpd/profile.d/mpd.sh $(HOME)/.profile.d
+	cp -p .. mpd/profile.d/* $(HOME)/.profile.d
 	cp -p -- mpd/mpdconf $(HOME)/.mpdconf
 
 install-mutt:
@@ -423,6 +423,11 @@ install-perlcritic:
 install-perltidy:
 	cp -p -- perltidy/perltidyrc $(HOME)/.perltidyrc
 
+install-plenv:
+	mkdir -p -- $(HOME)/.profile.d/ $(HOME)/.shrc.d
+	cp -p -- plenv/profile.d/* $(HOME)/.profile.d
+	cp -p -- plenv/shrc.d/* $(HOME)/.shrc.d
+
 install-psql:
 	cp -p -- psql/psqlrc $(HOME)/.psqlrc
 
diff --git a/plenv/profile.d/plenv.sh b/plenv/profile.d/plenv.sh
new file mode 100644
index 00000000..b2b491e1
--- /dev/null
+++ b/plenv/profile.d/plenv.sh
@@ -0,0 +1,5 @@
+# Add plenv to PATH and MANPATH if it appears to be in use
+[ -d "$HOME"/.plenv ] || return
+PATH=$HOME/.plenv/shims:$HOME/.plenv/bin:$PATH
+MANPATH=$HOME/.plenv/versions/$(perl -e 'print substr($^V,1)')/man:$MANPATH
+export MANPATH
diff --git a/plenv/shrc.d/plenv.sh b/plenv/shrc.d/plenv.sh
new file mode 100644
index 00000000..6e03618e
--- /dev/null
+++ b/plenv/shrc.d/plenv.sh
@@ -0,0 +1,17 @@
+# POSIX-compatible version of the plenv Bash shell wrapper
+[ -d "$HOME"/.plenv ] || return
+plenv() {
+    case $1 in
+        rehash)
+            shift
+            eval "$(plenv sh-rehash "$@")"
+            ;;
+        shell)
+            shift
+            eval "$(plenv sh-shell "$@")"
+            ;;
+        *)
+            command plenv "$@"
+            ;;
+    esac
+}
diff --git a/sh/profile.d/plenv.sh b/sh/profile.d/plenv.sh
deleted file mode 100644
index b2b491e1..00000000
--- a/sh/profile.d/plenv.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Add plenv to PATH and MANPATH if it appears to be in use
-[ -d "$HOME"/.plenv ] || return
-PATH=$HOME/.plenv/shims:$HOME/.plenv/bin:$PATH
-MANPATH=$HOME/.plenv/versions/$(perl -e 'print substr($^V,1)')/man:$MANPATH
-export MANPATH
diff --git a/sh/shrc.d/plenv.sh b/sh/shrc.d/plenv.sh
deleted file mode 100644
index 6e03618e..00000000
--- a/sh/shrc.d/plenv.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# POSIX-compatible version of the plenv Bash shell wrapper
-[ -d "$HOME"/.plenv ] || return
-plenv() {
-    case $1 in
-        rehash)
-            shift
-            eval "$(plenv sh-rehash "$@")"
-            ;;
-        shell)
-            shift
-            eval "$(plenv sh-shell "$@")"
-            ;;
-        *)
-            command plenv "$@"
-            ;;
-    esac
-}
-- 
cgit v1.2.3