summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-30 17:32:07 +0100
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 16:32:26 +0200
commitb3bba232ac6e1feff9e506506247aa20cd7f467c (patch)
treea4630f87da2fc641d8b3b56ec8fcb360dda395b0 /functions
parent6b7c8ed4bf15175299729355f04d60dcbac1aded (diff)
downloadvyos-live-build-b3bba232ac6e1feff9e506506247aa20cd7f467c.tar.gz
vyos-live-build-b3bba232ac6e1feff9e506506247aa20cd7f467c.zip
usage: take exit code as param
thus it can correctly indicate success/fail status instead of always indicating failure. when a user asks for usage with -u|--usage then we should exit in success mode rather than failure as when usage in printed in response to incorrect usage. Gbp-Dch: Short
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/arguments.sh4
-rwxr-xr-xfunctions/usage.sh6
2 files changed, 7 insertions, 3 deletions
diff --git a/functions/arguments.sh b/functions/arguments.sh
index a8dd33251..2c1266f78 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -127,7 +127,7 @@ Arguments ()
fi
exit 0
elif [ "${IS_FRONTEND}" = "true" ]; then
- Usage
+ Usage 0
fi
;;
@@ -137,7 +137,7 @@ Arguments ()
;;
-u|--usage)
- Usage
+ Usage 0
shift
;;
diff --git a/functions/usage.sh b/functions/usage.sh
index 19a91c110..388763895 100755
--- a/functions/usage.sh
+++ b/functions/usage.sh
@@ -11,6 +11,10 @@
Usage ()
{
+ if [ -z "${1}" ]; then
+ Echo_error "Usage() requires an exit code"
+ fi
+
echo "${PROGRAM_NAME} - ${DESCRIPTION}"
printf "\nUsage:\n\n"
@@ -25,5 +29,5 @@ Usage ()
echo
echo "Try \"${PROGRAM} --help\" for more information."
- exit 1
+ exit $1
}