diff --git a/Labb7/ovning1.sh b/Labb7/ovning1.sh index 0f5fca8..a59aa28 100755 --- a/Labb7/ovning1.sh +++ b/Labb7/ovning1.sh @@ -11,7 +11,7 @@ Whereis="/usr/bin/whereis" # Santiy checks if [ ! -x $Dialog ]; then echo "Can't excute $Dialog" - exit 2 + exit 1 fi # Main @@ -25,7 +25,7 @@ BinPath=`$Whereis $Browser | awk '{ print $2 }'` echo $BinPath | grep / &> /dev/null if [ $? -ne 0 ]; then $Dialog --msgbox "It seems that you don't have $Browser installed" 10 60 - exit 2 + exit 1 fi $Dialog --infobox "Starting up $Browser for you" 10 60 diff --git a/Labb7/ovning1_zenity.sh b/Labb7/ovning1_zenity.sh index 0e5c77d..50b833d 100755 --- a/Labb7/ovning1_zenity.sh +++ b/Labb7/ovning1_zenity.sh @@ -11,7 +11,7 @@ Whereis="/usr/bin/whereis" # Santiy checks if [ ! -x $Zenity ]; then echo "Can't excute $Zenity" - exit 2 + exit 1 fi # Main @@ -25,7 +25,7 @@ BinPath=`$Whereis $Browser | awk '{ print $2 }'` echo $BinPath | grep / &> /dev/null if [ $? -ne 0 ]; then $Zenity --info --text="It seems you don't have $Browser installed" - exit 2 + exit 1 fi $BinPath & diff --git a/Labb7/ovning2.sh b/Labb7/ovning2.sh index 4a5f92e..1a1467f 100755 --- a/Labb7/ovning2.sh +++ b/Labb7/ovning2.sh @@ -15,13 +15,13 @@ Printf="/usr/bin/printf" # Sanity checks if [ ! -w `dirname $File` ]; then echo "Can't write to `dirname $File`" - exit 2 + exit 1 fi for bin in $Awk $Dialog $Printf; do if [ ! -x $Bin ]; then echo "Can't execute $Bin" - exit 2 + exit 1 fi done diff --git a/Labb7/ovning2_zenity.sh b/Labb7/ovning2_zenity.sh index fa121e6..81c369f 100755 --- a/Labb7/ovning2_zenity.sh +++ b/Labb7/ovning2_zenity.sh @@ -16,18 +16,18 @@ Rm="/bin/rm" # Sanity checks if [ ! -w `dirname $File` ]; then echo "Can't write to `dirname $File`" - exit 2 + exit 1 fi if [ ! -w /tmp/ ]; then echo "Can't write to /tmp/" - exit 2 + exit 1 fi for bin in $Awk $Zenity $Printf $Rm; do if [ ! -x $Bin ]; then echo "Can't execute $Bin" - exit 2 + exit 1 fi done diff --git a/Labb7/ovning3.sh b/Labb7/ovning3.sh index a802bff..4977328 100755 --- a/Labb7/ovning3.sh +++ b/Labb7/ovning3.sh @@ -21,7 +21,7 @@ ask() 2> /tmp/createuser if [ $? -eq 255 ]; then echo "Aborting, user hit ESC" - exit 2 + exit 1 fi Input=`$Cat /tmp/createuser` @@ -31,13 +31,13 @@ ask() # Sanity checks if [ $EUID -ne 0 ]; then echo "You need to run this script as root" - exit 2 + exit 1 fi for bin in $Chpasswd $Useradd $Dialog $Grep $Cat $Rm; do if [ ! -x $bin ]; then echo "Can't execute $bin" - exit 2 + exit 1 fi done @@ -56,7 +56,7 @@ $Dialog --backtitle "Create new user"\ 2> /tmp/createuser if [ $? -eq 255 ]; then echo "Aborting, user hit ESC" - exit 2 + exit 1 fi Input=`$Cat /tmp/createuser` UserShell=$Input diff --git a/Labb7/ovning3_zenity.sh b/Labb7/ovning3_zenity.sh index 98a1772..60ceac1 100755 --- a/Labb7/ovning3_zenity.sh +++ b/Labb7/ovning3_zenity.sh @@ -25,7 +25,7 @@ ask() > /tmp/createuser if [ $? -eq 1 ]; then echo "Aborting, user hit cancel..." - exit 2 + exit 1 fi Input=`$Cat /tmp/createuser` } @@ -42,13 +42,13 @@ extract_data() # Sanity checks if [ $EUID -ne 0 ]; then echo "You need to run this script as root" - exit 2 + exit 1 fi for bin in $Chpasswd $Useradd $Zenity $Grep $Cat $Rm; do if [ ! -x $bin ]; then echo "Can't execute $bin" - exit 2 + exit 1 fi done @@ -67,7 +67,7 @@ $Rm /tmp/createuser $Useradd -m -s $UserShell -c "$Comment" $Username if [ $? -ne 0 ]; then echo "Couldn't create new user $Username, aborting" - exit 2 + exit 1 fi echo "${Username}:${Password}" | $Chpasswd