From 6092b9d93df1c3d5170a2b6aa0275aebef18bd37 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 25 May 2017 14:39:05 -0400 Subject: start moving things to use the libremessages exit codes --- src/abslibre-tools/createworkdir | 4 ++-- src/abslibre-tools/diff-unfree | 6 +++--- src/abslibre-tools/libreaddiff | 6 +++--- src/abslibre-tools/libredbdiff | 12 ++++++------ src/abslibre-tools/librerelease | 6 +++--- src/abslibre-tools/librestage | 22 +++++++++++----------- 6 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/abslibre-tools') diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir index 6f58b05..aa1425d 100755 --- a/src/abslibre-tools/createworkdir +++ b/src/abslibre-tools/createworkdir @@ -4,7 +4,7 @@ # Copyright (C) 2010-2011 Nicolás Reynolds # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) -# Copyright (C) 2013 Luke Shumaker +# Copyright (C) 2013, 2017 Luke Shumaker # # License: GNU GPLv3+ # @@ -46,7 +46,7 @@ main() { echo printf '%q ' "${cmd[@]}" echo - exit 1 + exit $EXIT_FAILURE fi msg "Finished, your packaging directory tree looks like this now:" diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree index 860c985..29025e2 100755 --- a/src/abslibre-tools/diff-unfree +++ b/src/abslibre-tools/diff-unfree @@ -37,7 +37,7 @@ usage() { main() { if [[ "$1" == "--help" ]]; then usage - return 0 + return $EXIT_SUCCESS fi load_conf libretools.conf DIFFPROG || exit @@ -56,14 +56,14 @@ main() { if [[ ! -r PKGBUILD ]]; then error "This is not a build dir." - return 1 + exit $EXIT_FAILURE fi tmp_dir="$(mktemp --tmpdir -d "${package}.XXXXXX")" if [[ ! -d "${tmp_dir}" ]]; then error "Can't create temp dir" - return 1 + exit $EXIT_FAILURE fi unfree_dir="${tmp_dir}/${svnrepo}/${package}/${trunk}" diff --git a/src/abslibre-tools/libreaddiff b/src/abslibre-tools/libreaddiff index 9336198..c97ab7c 100755 --- a/src/abslibre-tools/libreaddiff +++ b/src/abslibre-tools/libreaddiff @@ -37,13 +37,13 @@ main() { while getopts 'h' arg; do case "$arg" in - h) usage; exit 0 ;; - *) usage >&2; exit 2 ;; + h) usage; exit $EXIT_SUCCESS ;; + *) usage >&2; exit $EXIT_INVALIDARGUMENT ;; esac done if [[ $# -ne 1 ]] && [[ $# -ne 2 ]]; then usage >&2 - exit 2 + exit $EXIT_INVALIDARGUMENT fi # The repo to find missing packages in. diff --git a/src/abslibre-tools/libredbdiff b/src/abslibre-tools/libredbdiff index 5d301f6..3fc505c 100755 --- a/src/abslibre-tools/libredbdiff +++ b/src/abslibre-tools/libredbdiff @@ -201,7 +201,7 @@ main() { ;; -h|--help) usage - return 0 + exit $EXIT_SUCCESS ;; --) break @@ -210,7 +210,7 @@ main() { done if $badargs; then usage >&2 - return 2 + exit $EXIT_INVALIDARGUMENT fi case $mode in @@ -218,7 +218,7 @@ main() { if [[ $# -gt 0 ]]; then print "%s: found non-flag arguments; a repo list may only be specified with the -n flag: %s" "$cmd" "$*" >&2 usage >&2 - return 2 + exit $EXIT_INVALIDARGUMENT fi main_update ;; @@ -226,7 +226,7 @@ main() { if [[ $# -gt 1 ]]; then print "%s: found too many non-flag arguments; only one repo may be specified: %s" "$cmd" "$*" >&2 usage >&2 - return 2 + exit $EXIT_INVALIDARGUMENT fi if [[ $# = 1 ]]; then if ! in_array "$1" "${repos[@]}"; then @@ -242,7 +242,7 @@ main_update() { if [[ $EUID != 0 ]]; then error "Must run as root to initialize or update %s databases." "$cmd" usage >&2 - exit 1 + exit $EXIT_NOPERMISSION fi load_conf libredbdiff.conf statedir mirror_prbl mirror_arch || exit @@ -305,7 +305,7 @@ main_compare() { then error "You must run %q with out arguments as root to initialize." "$cmd" usage >&2 - exit 1 + exit $EXIT_INVALIDARGUMENT fi local tmpdir diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index e673081..e6c180e 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -62,7 +62,7 @@ list0_files() { # This function is taken almost verbatim from makepkg create_signature() { - local ret=0 + local ret=$EXIT_SUCCESS local filename="$1" msg "Signing package..." @@ -71,7 +71,7 @@ create_signature() { SIGNWITHKEY=(-u "${GPGKEY}") fi # The signature will be generated directly in ascii-friendly format - gpg --detach-sign --use-agent "${SIGNWITHKEY[@]}" "$filename" || ret=$? + gpg --detach-sign --use-agent "${SIGNWITHKEY[@]}" "$filename" || ret=$EXIT_FAILURE if (( ! ret )); then @@ -100,7 +100,7 @@ sign_packages() { fi if ! [[ -f "${file}.sig" ]]; then - create_signature "$file" || return 2 + create_signature "$file" || return fi done } 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 # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) -# Copyright (C) 2013-2014 Luke Shumaker +# Copyright (C) 2013-2014, 2017 Luke Shumaker # # 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 } -- cgit v1.2.2