From c2372b7fd45ab87ef983ae5c847977b552f74ae4 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 30 Nov 2018 14:52:22 +1300
Subject: Remove redundant element from install scripts path

---
 Makefile                       |  4 ++--
 install/conf.sh                | 10 ++++++++++
 install/install-conf.sh        | 10 ----------
 install/install-login-shell.sh | 10 ----------
 install/login-shell.sh         | 10 ++++++++++
 5 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 install/conf.sh
 delete mode 100644 install/install-conf.sh
 delete mode 100644 install/install-login-shell.sh
 create mode 100644 install/login-shell.sh

diff --git a/Makefile b/Makefile
index 3093b96d..f9ed21ac 100644
--- a/Makefile
+++ b/Makefile
@@ -352,7 +352,7 @@ install: install-bin \
 	install-vim
 
 install-conf:
-	sh install/install-conf.sh
+	sh install/conf.sh
 
 install-abook:
 	mkdir -p -- $(HOME)/.abook
@@ -465,7 +465,7 @@ install-ksh: check-ksh install-sh
 	cp -p -- ksh/kshrc.d/* $(HOME)/.kshrc.d
 
 install-login-shell: check-login-shell
-	sh install/install-login-shell.sh
+	sh install/login-shell.sh
 
 install-perlcritic:
 	cp -p -- perlcritic/perlcriticrc $(HOME)/.perlcriticrc
diff --git a/install/conf.sh b/install/conf.sh
new file mode 100644
index 00000000..f50cde73
--- /dev/null
+++ b/install/conf.sh
@@ -0,0 +1,10 @@
+# Read extra targets from an optional ~/.dotfiles.conf file
+if [ -e "$HOME"/.dotfiles.conf ] ; then
+    while read -r line ; do
+        case $line in
+            '#'*|'') ;;
+            *) set -- "$@" "$line" ;;
+        esac
+    done < "$HOME"/.dotfiles.conf
+fi
+make install "$@"
diff --git a/install/install-conf.sh b/install/install-conf.sh
deleted file mode 100644
index f50cde73..00000000
--- a/install/install-conf.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Read extra targets from an optional ~/.dotfiles.conf file
-if [ -e "$HOME"/.dotfiles.conf ] ; then
-    while read -r line ; do
-        case $line in
-            '#'*|'') ;;
-            *) set -- "$@" "$line" ;;
-        esac
-    done < "$HOME"/.dotfiles.conf
-fi
-make install "$@"
diff --git a/install/install-login-shell.sh b/install/install-login-shell.sh
deleted file mode 100644
index f38aa0c1..00000000
--- a/install/install-login-shell.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-target=install-sh
-case ${SHELL##*/} in
-    bash)
-        target=install-bash ;;
-    ksh|ksh88|ksh93|mksh|pdksh)
-        target=install-ksh ;;
-    zsh)
-        target=install-zsh ;;
-esac
-make "$target"
diff --git a/install/login-shell.sh b/install/login-shell.sh
new file mode 100644
index 00000000..f38aa0c1
--- /dev/null
+++ b/install/login-shell.sh
@@ -0,0 +1,10 @@
+target=install-sh
+case ${SHELL##*/} in
+    bash)
+        target=install-bash ;;
+    ksh|ksh88|ksh93|mksh|pdksh)
+        target=install-ksh ;;
+    zsh)
+        target=install-zsh ;;
+esac
+make "$target"
-- 
cgit v1.2.3