Skip to content

Commit 966547e

Browse files
committed
gupload: Always exit after --update or --uninstall flag is used
1 parent 5c7340d commit 966547e

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

bash/release/gupload

+6-2
Original file line numberDiff line numberDiff line change
@@ -1164,8 +1164,12 @@ _setup_arguments() {
11641164
if [[ ${1} = -* ]]; then
11651165
[[ ${GUPLOAD_INSTALLED_WITH} = script ]] && {
11661166
case "${1}" in
1167-
-u | --update) _check_debug && _update && exit "${?}" ;;
1168-
--uninstall) _check_debug && _update uninstall && exit "${?}" ;;
1167+
-u | --update)
1168+
_check_debug && _update && { exit 0 || exit 1; }
1169+
;;
1170+
--uninstall)
1171+
_check_debug && _update uninstall && { exit 0 || exit 1; }
1172+
;;
11691173
esac
11701174
}
11711175
printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1

bash/upload.bash

+6-2
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,12 @@ _setup_arguments() {
231231
if [[ ${1} = -* ]]; then
232232
[[ ${GUPLOAD_INSTALLED_WITH} = script ]] && {
233233
case "${1}" in
234-
-u | --update) _check_debug && _update && exit "${?}" ;;
235-
--uninstall) _check_debug && _update uninstall && exit "${?}" ;;
234+
-u | --update)
235+
_check_debug && _update && { exit 0 || exit 1; }
236+
;;
237+
--uninstall)
238+
_check_debug && _update uninstall && { exit 0 || exit 1; }
239+
;;
236240
esac
237241
}
238242
printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1

sh/release/gupload

+6-2
Original file line numberDiff line numberDiff line change
@@ -1157,8 +1157,12 @@ _setup_arguments() {
11571157
if [ -z "${1##-*}" ]; then
11581158
[ "${GUPLOAD_INSTALLED_WITH}" = script ] && {
11591159
case "${1}" in
1160-
-u | --update) _check_debug && _update && exit "${?}" ;;
1161-
--uninstall) _check_debug && _update uninstall && exit "${?}" ;;
1160+
-u | --update)
1161+
_check_debug && _update && { exit 0 || exit 1; }
1162+
;;
1163+
--uninstall)
1164+
_check_debug && _update uninstall && { exit 0 || exit 1; }
1165+
;;
11621166
esac
11631167
}
11641168
printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1

sh/upload.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,12 @@ _setup_arguments() {
239239
if [ -z "${1##-*}" ]; then
240240
[ "${GUPLOAD_INSTALLED_WITH}" = script ] && {
241241
case "${1}" in
242-
-u | --update) _check_debug && _update && exit "${?}" ;;
243-
--uninstall) _check_debug && _update uninstall && exit "${?}" ;;
242+
-u | --update)
243+
_check_debug && _update && { exit 0 || exit 1; }
244+
;;
245+
--uninstall)
246+
_check_debug && _update uninstall && { exit 0 || exit 1; }
247+
;;
244248
esac
245249
}
246250
printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1

0 commit comments

Comments
 (0)