From 41afd423d966c0d8a7f0a553bb8406560450d2a3 Mon Sep 17 00:00:00 2001
From: Jack-Benny Persson <jack-benny@cyberinfo.se>
Date: Wed, 8 Jan 2014 16:57:03 +0100
Subject: [PATCH] Renamed and moved from Dash to Ash

---
 Makefile                        |  6 +++---
 ashfiles/profile                |  3 +++
 bashfiles/{.bashrc => bashrc}   |  2 +-
 bashfiles/{.profile => profile} |  0
 cshfiles/{.cshrc => cshrc}      |  0
 dashfiles/.profile              |  5 -----
 shellchooser.sh                 | 22 +++++++++++-----------
 7 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 ashfiles/profile
 rename bashfiles/{.bashrc => bashrc} (99%)
 rename bashfiles/{.profile => profile} (100%)
 rename cshfiles/{.cshrc => cshrc} (100%)
 delete mode 100644 dashfiles/.profile

diff --git a/Makefile b/Makefile
index de1f41b..e96f97f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-FILES=shellchooser.sh bashfiles/.profile bashfiles/.bashrc cshfiles/.cshrc \
-dashfiles/.profile
+FILES=shellchooser.sh bashfiles/profile bashfiles/bashrc cshfiles/cshrc \
+ashfiles/profile
 
 shellchooser: $(FILES)
 	$(info Use 'make install' to install shellchooser on your system)
@@ -12,7 +12,7 @@ install: $(FILES)
 	mkdir /etc/shellchooser
 	cp -r bashfiles /etc/shellchooser/bashfiles
 	cp -r cshfiles /etc/shellchooser/cshfiles
-	cp -r dashfiles /etc/shellchooser/dashfiles
+	cp -r ashfiles /etc/shellchooser/ashfiles
 
 uninstall:
 	rm /bin/shellchooser.sh
diff --git a/ashfiles/profile b/ashfiles/profile
new file mode 100644
index 0000000..70bd5ac
--- /dev/null
+++ b/ashfiles/profile
@@ -0,0 +1,3 @@
+# Placeholder for Ash-profile
+
+
diff --git a/bashfiles/.bashrc b/bashfiles/bashrc
similarity index 99%
rename from bashfiles/.bashrc
rename to bashfiles/bashrc
index caf75c3..8826d7c 100644
--- a/bashfiles/.bashrc
+++ b/bashfiles/bashrc
@@ -127,7 +127,7 @@ unset color_prompt force_color_prompt
 
 # If this is an xterm set the title to user@host:dir
 case "$TERM" in
-xterm*|rxvt*)
+xterm-256color|rxvt*)
     PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
     ;;
 *)
diff --git a/bashfiles/.profile b/bashfiles/profile
similarity index 100%
rename from bashfiles/.profile
rename to bashfiles/profile
diff --git a/cshfiles/.cshrc b/cshfiles/cshrc
similarity index 100%
rename from cshfiles/.cshrc
rename to cshfiles/cshrc
diff --git a/dashfiles/.profile b/dashfiles/.profile
deleted file mode 100644
index 8be06a4..0000000
--- a/dashfiles/.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
-
diff --git a/shellchooser.sh b/shellchooser.sh
index 17dcd78..f1ff367 100755
--- a/shellchooser.sh
+++ b/shellchooser.sh
@@ -34,7 +34,7 @@ Binaries=(clear cp printf cat mktemp rm tail dialog diff)
 # Variables
 BashFiles="/etc/shellchooser/bashfiles"
 CshFiles="/etc/shellchooser/cshfiles"
-DashFiles="/etc/shellchooser/dashfiles"
+DashFiles="/etc/shellchooser/ashfiles"
 
 
 ### Functions ###
@@ -68,7 +68,7 @@ chooser()
 	Temp=`$Mktemp -t chooser.XXXX`
 	$Dialog --backtitle "Shell Chooser" \
 	--menu "Choose your shell" 10 60 3 "/bin/bash" Bash \
-	"/bin/dash" Dash "/bin/csh" Csh 2> $Temp
+	"/bin/ash" Ash "/bin/csh" Csh 2> $Temp
 	if [ $? -ne 0 ]; then
 		return 1
 	fi
@@ -81,25 +81,25 @@ check_env()
 {
 	case $Shell in
 	"/bin/bash")
-		$Diff ${HOME}/.profile ${BashFiles}/.profile &> /dev/null
+		$Diff ${HOME}/.profile ${BashFiles}/profile &> /dev/null
 		if [ $? -ne 0 ]; then
-			$Cp ${BashFiles}/.profile ${HOME}
+			$Cp ${BashFiles}/profile ${HOME}/.profile
 		fi
-		$Diff ${HOME}/.bashrc ${BashFiles}/.bashrc &> /dev/null
+		$Diff ${HOME}/.bashrc ${BashFiles}/bashrc &> /dev/null
 		if [ $? -ne 0 ]; then
-			$Cp ${BashFiles}/.bashrc ${HOME}
+			$Cp ${BashFiles}/bashrc ${HOME}/.bashrc
 		fi
 		;;
 	"/bin/csh")
-		$Diff ${HOME}/.cshrc ${CshFiles}/.cshrc &> /dev/null
+		$Diff ${HOME}/.cshrc ${CshFiles}/cshrc &> /dev/null
 		if [ $? -ne 0 ]; then
-			$Cp ${CshFiles}/.cshrc ${HOME}
+			$Cp ${CshFiles}/cshrc ${HOME}/.cshrc
 		fi
 		;;
-	"/bin/dash")
-		$Diff ${HOME}/.profile ${DashFiles}./profile
+	"/bin/ash")
+		$Diff ${HOME}/.profile ${AshFiles}/profile
 		if [ $? -ne 0 ]; then
-			$Cp ${DashFiles}/.profile ${HOME}
+			$Cp ${AshFiles}/profile ${HOME}/.profile
 		fi
 	esac
 }