Fixed Makefile and uncommented check_env in script

This commit is contained in:
Jack-Benny Persson 2014-01-08 06:43:43 +01:00
parent 69f2fbdc7d
commit dfa8b8f515
2 changed files with 9 additions and 9 deletions

View File

@ -9,12 +9,11 @@ shellchooser: $(FILES)
install: $(FILES) install: $(FILES)
chmod 755 shellchooser.sh chmod 755 shellchooser.sh
cp shellchooser.sh /bin/shellchooser.sh cp shellchooser.sh /bin/shellchooser.sh
cp -r bashfiles /etc/bashfiles mkdir /etc/shellchooser
cp -r cshfiles /etc/cshfiles cp -r bashfiles /etc/shellchooser/bashfiles
cp -r dashfiles /etc/dashfiles cp -r cshfiles /etc/shellchooser/cshfiles
cp -r dashfiles /etc/shellchooser/dashfiles
uninstall: uninstall:
rm /bin/shellchooser.sh rm /bin/shellchooser.sh
rm -rf /etc/bashfiles rm -rf /etc/shellchooser
rm -rf /etc/cshfiles
rm -rf /etc/dashfiles

View File

@ -32,8 +32,9 @@ Which="/usr/bin/which"
Binaries=(clear cp printf cat mktemp rm tail dialog diff) Binaries=(clear cp printf cat mktemp rm tail dialog diff)
# Variables # Variables
BashFiles="/etc/shellchooser/bash" BashFiles="/etc/shellchooser/bashfiles"
CshFiles="/etc/shellchooser/csh" CshFiles="/etc/shellchooser/cshfiles"
DashFiles="/etc/shellchooser/dashfiles"
### Functions ### ### Functions ###
@ -140,7 +141,7 @@ if [ $? -ne 0 ]; then
echo "Aborting..." echo "Aborting..."
exit 1 exit 1
fi fi
#check_env check_env
$Clear $Clear
$Shell $Shell