gupload: Always exit after --update or --uninstall flag is used

labbots · Nov 7, 2020 · 966547e · 966547e
1 parent 5c7340d
commit 966547e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/bash/release/gupload b/bash/release/gupload
@@ -1164,8 +1164,12 @@ _setup_arguments() {
                 if [[ ${1} = -* ]]; then
                     [[ ${GUPLOAD_INSTALLED_WITH} = script ]] && {
                         case "${1}" in
-                            -u | --update) _check_debug && _update && exit "${?}" ;;
-                            --uninstall) _check_debug && _update uninstall && exit "${?}" ;;
+                            -u | --update)
+                                _check_debug && _update && { exit 0 || exit 1; }
+                                ;;
+                            --uninstall)
+                                _check_debug && _update uninstall && { exit 0 || exit 1; }
+                                ;;
                         esac
                     }
                     printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1

diff --git a/bash/upload.bash b/bash/upload.bash
@@ -231,8 +231,12 @@ _setup_arguments() {
                 if [[ ${1} = -* ]]; then
                     [[ ${GUPLOAD_INSTALLED_WITH} = script ]] && {
                         case "${1}" in
-                            -u | --update) _check_debug && _update && exit "${?}" ;;
-                            --uninstall) _check_debug && _update uninstall && exit "${?}" ;;
+                            -u | --update)
+                                _check_debug && _update && { exit 0 || exit 1; }
+                                ;;
+                            --uninstall)
+                                _check_debug && _update uninstall && { exit 0 || exit 1; }
+                                ;;
                         esac
                     }
                     printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1

diff --git a/sh/release/gupload b/sh/release/gupload
@@ -1157,8 +1157,12 @@ _setup_arguments() {
                 if [ -z "${1##-*}" ]; then
                     [ "${GUPLOAD_INSTALLED_WITH}" = script ] && {
                         case "${1}" in
-                            -u | --update) _check_debug && _update && exit "${?}" ;;
-                            --uninstall) _check_debug && _update uninstall && exit "${?}" ;;
+                            -u | --update)
+                                _check_debug && _update && { exit 0 || exit 1; }
+                                ;;
+                            --uninstall)
+                                _check_debug && _update uninstall && { exit 0 || exit 1; }
+                                ;;
                         esac
                     }
                     printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1

diff --git a/sh/upload.sh b/sh/upload.sh
@@ -239,8 +239,12 @@ _setup_arguments() {
                 if [ -z "${1##-*}" ]; then
                     [ "${GUPLOAD_INSTALLED_WITH}" = script ] && {
                         case "${1}" in
-                            -u | --update) _check_debug && _update && exit "${?}" ;;
-                            --uninstall) _check_debug && _update uninstall && exit "${?}" ;;
+                            -u | --update)
+                                _check_debug && _update && { exit 0 || exit 1; }
+                                ;;
+                            --uninstall)
+                                _check_debug && _update uninstall && { exit 0 || exit 1; }
+                                ;;
                         esac
                     }
                     printf '%s: %s: Unknown option\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && exit 1