jackbenny/shellchooser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed return code from chooser

Browse Source
This commit is contained in:
Jack-Benny Persson 2014-01-07 18:00:34 +01:00
parent 88fe5876cb
commit 1cfa6e53b9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shellchooser.sh
View File

@ -28,7 +28,7 @@ Author="Jack-Benny Persson (jack-benny@cyberinfo.se)"
Which="/usr/bin/which" Which="/usr/bin/which"
# Binaries entered in the list will be avalible to the script as variables with # Binaries entered in the list will be avalible to the script as variables with
# the first letter uppercase # the first letter uppercase
Binaries=(cp printf cat mktemp rm tail dialog) Binaries=(clear cp printf cat mktemp rm tail dialog diff)
# Variables # Variables
Skel="/etc/skel" Skel="/etc/skel"
@ -64,7 +64,9 @@ chooser()
$Dialog --backtitle "Shell Chooser" \ $Dialog --backtitle "Shell Chooser" \
--menu "Choose your shell" 10 60 3 "/bin/bash" Bash \ --menu "Choose your shell" 10 60 3 "/bin/bash" Bash \
"/bin/dash" Dash "/bin/csh" Csh 2> $Temp "/bin/dash" Dash "/bin/csh" Csh 2> $Temp
return $? if [ $? -ne 0 ]; then
return 1
fi
Shell=`$Cat $Temp` Shell=`$Cat $Temp`
} }
@ -73,11 +75,11 @@ check_env()
{ {
case $Shell in case $Shell in
"/bin/bash") "/bin/bash")
diff ${HOME}/.profile ${Skel}/.profile &> /dev/null $Diff ${HOME}/.profile ${Skel}/.profile &> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
$Cp ${Skel}/.profile ${HOME} $Cp ${Skel}/.profile ${HOME}
fi fi
diff ${HOME}/.bashrc ${Skel}/.bashrc &> /dev/null $Diff ${HOME}/.bashrc ${Skel}/.bashrc &> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
$Cp ${Skel}/.bashrc ${HOME} $Cp ${Skel}/.bashrc ${HOME}
fi fi
@ -124,8 +126,9 @@ if [ $? -ne 0 ]; then
echo "Aborting..." echo "Aborting..."
exit 1 exit 1
fi fi
check_env #check_env
`$Shell` $Clear
$Shell
exit 0 exit 0