Skip to content

Commit aefd297

Browse files
committed
Minor tweaks to some exit codes & state convention
1 parent f7d3c51 commit aefd297

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function parse_params() {
5151
cron=true
5252
;;
5353
*)
54-
script_exit "Invalid parameter was provided: $param" 2
54+
script_exit "Invalid parameter was provided: $param" 1
5555
;;
5656
esac
5757
done

source.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ function script_trap_exit() {
7979
# ARGS: $1 (required): Message to print on exit
8080
# $2 (optional): Exit code (defaults to 0)
8181
# OUTS: None
82+
# NOTE: The convention used in this script for exit codes is:
83+
# 0: Normal exit
84+
# 1: Abnormal exit due to external error
85+
# 2: Abnormal exit due to script error
8286
function script_exit() {
8387
if [[ $# -eq 1 ]]; then
8488
printf '%s\n' "$1"
@@ -241,7 +245,7 @@ function lock_init() {
241245
readonly script_lock="$lock_dir"
242246
verbose_print "Acquired script lock: $script_lock"
243247
else
244-
script_exit "Unable to acquire script lock: $lock_dir" 2
248+
script_exit "Unable to acquire script lock: $lock_dir" 1
245249
fi
246250
}
247251

template.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ function script_trap_exit() {
8383
# ARGS: $1 (required): Message to print on exit
8484
# $2 (optional): Exit code (defaults to 0)
8585
# OUTS: None
86+
# NOTE: The convention used in this script for exit codes is:
87+
# 0: Normal exit
88+
# 1: Abnormal exit due to external error
89+
# 2: Abnormal exit due to script error
8690
function script_exit() {
8791
if [[ $# -eq 1 ]]; then
8892
printf '%s\n' "$1"
@@ -245,7 +249,7 @@ function lock_init() {
245249
readonly script_lock="$lock_dir"
246250
verbose_print "Acquired script lock: $script_lock"
247251
else
248-
script_exit "Unable to acquire script lock: $lock_dir" 2
252+
script_exit "Unable to acquire script lock: $lock_dir" 1
249253
fi
250254
}
251255

@@ -438,7 +442,7 @@ function parse_params() {
438442
cron=true
439443
;;
440444
*)
441-
script_exit "Invalid parameter was provided: $param" 2
445+
script_exit "Invalid parameter was provided: $param" 1
442446
;;
443447
esac
444448
done

0 commit comments

Comments
 (0)