diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-25 14:39:05 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-25 17:28:30 -0400 |
commit | 6092b9d93df1c3d5170a2b6aa0275aebef18bd37 (patch) | |
tree | 55627e026fa7f538f8085f0fb8ed1fffcce4fcbc /src/abslibre-tools/librestage | |
parent | aedbebb0ea3c7b40dda987b43ff21475ef67f423 (diff) |
start moving things to use the libremessages exit codes
Diffstat (limited to 'src/abslibre-tools/librestage')
-rwxr-xr-x | src/abslibre-tools/librestage | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 0794b13..f1f74cd 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -4,7 +4,7 @@ # Copyright (C) 2010-2012 Nicolás Reynolds <fauno@parabola.nu> # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com> -# Copyright (C) 2013-2014 Luke Shumaker <lukeshu@sbcglobal.net> +# Copyright (C) 2013-2014, 2017 Luke Shumaker <lukeshu@sbcglobal.net> # # License: GNU GPLv3+ # @@ -37,26 +37,26 @@ usage() { main() { if [[ -w / ]]; then error "This program should be run as a regular user" - return 1 + return $EXIT_NOPERMISSION fi # Parse options, set up while getopts 'h' arg; do case $arg in - h) usage; return 0;; - *) usage >&2; return 1;; + h) usage; return $EXIT_SUCCESS;; + *) usage >&2; return $EXIT_INVALIDARGUMENT;; esac done local repo= case $# in 0) repo="$(basename "$(dirname "$PWD")")";; 1) repo=$1;; - *) usage >&2; return 1;; + *) usage >&2; return $EXIT_INVALIDARGUMENT;; esac if ! [[ -e ./PKGBUILD ]]; then error "PKGBUILD not found" - return 1 + return $EXIT_FAILURE fi # Load configuration @@ -101,7 +101,7 @@ main() { staged=true else error "Can't put %s on [%s]" "$_pkgname" "$repo" - return 1 + return $EXIT_FAILURE fi done if pkgfile=$(find_cached_srcpackage "$pkgbase" "$(get_full_version)" "$CARCH"); then @@ -113,7 +113,7 @@ main() { staged=true else error "Can't put %s on [%s]" "$pkgbase" sources - return 1 + return $EXIT_FAILURE fi fi done @@ -147,7 +147,7 @@ main() { staged=true else error "Can't put %s on [%s]" "$srcname" other - return 1 + return $EXIT_FAILURE fi fi break @@ -156,10 +156,10 @@ main() { done if $staged ; then - return 0 + return $EXIT_SUCCESS else error "Nothing was staged" - return 1 + return $EXIT_FAILURE fi } |