Skip to content

Fail the scripts when commands fail and return 1 in error cases #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkerwin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fail the scripts when commands fail and return 1 in error cases #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions reissueKey.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
# Parameter 7 = Custom Branding - Defaults to Self Service Icon
#Customizing Window

## Exit the script when a command or piped action fails
set -e
set -o pipefail

selfServiceBrandIcon="/Users/$3/Library/Application Support/com.jamfsoftware.selfservice.mac/Documents/Images/brandingimage.png"
jamfBrandIcon="/Library/Application Support/JAMF/Jamf.app/Contents/Resources/AppIcon.icns"
fileVaultIcon="/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/FileVaultIcon.icns"
Expand All @@ -99,7 +103,6 @@ else
brandIcon=$fileVaultIcon
fi


## Get the logged in user's name
userName=$(/usr/bin/stat -f%Su /dev/console)

Expand Down Expand Up @@ -147,7 +150,7 @@ end run")
if [ "$?" == "1" ]
then
echo "User Canceled"
exit 0
exit 1
fi
try=$((try+1))
if [[ $BUILD -ge 13 ]] && [[ $BUILD -lt 17 ]]; then
Expand Down Expand Up @@ -196,7 +199,7 @@ end run"
if [ "$?" == "1" ]
then
echo "User Canceled"
exit 0
exit 1
else
try=$(($try+1))
fi
Expand All @@ -220,7 +223,7 @@ if [ $try -ge $maxTry ]
then
haltAlert
echo "Quitting.. Too Many failures"
exit 0
exit 1
else
echo $result
errorAlert
Expand Down