diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/abslibre-tools/librerelease | 4 | ||||
| -rwxr-xr-x | src/abslibre-tools/librestage | 4 | ||||
| -rwxr-xr-x | src/chroot-tools/librechroot | 14 | ||||
| -rwxr-xr-x | src/lib/libreblacklist | 2 | ||||
| -rwxr-xr-x | src/lib/librelib | 2 | ||||
| -rwxr-xr-x | src/librefetch/librefetch | 12 |
6 files changed, 19 insertions, 19 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index aca8fef..23a1c2d 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -149,12 +149,12 @@ main() { u) upload_only=true ;; n) dryrun="--dry-run" ;; h) mode=usage ;; - *) usage >/dev/stderr; return 1 ;; + *) usage >&2; return 1 ;; esac done shift $(($OPTIND - 1)) if [[ $# != 0 ]]; then - usage >/dev/stderr + usage >&2 return 1 fi diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage index 96fee8b..4ea6edc 100755 --- a/src/abslibre-tools/librestage +++ b/src/abslibre-tools/librestage @@ -42,12 +42,12 @@ main() { while getopts 'h' arg; do case $arg in h) usage; return 0;; - *) usage >/dev/stderr; return 1;; + *) usage >&2; return 1;; esac done repos=("$@") if [[ ${#repos[@]} -eq 0 ]]; then - usage >>/dev/stderr + usage >&2 return 1; fi diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 64c3a46..0f0ed10 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -223,19 +223,19 @@ main() { C|M) arch_nspawn_flags+=(-$opt "$OPTARG");; w) sysd_nspawn_flags+=("--bind=$OPTARG");; r) sysd_nspawn_flags+=("--bind-ro=$OPTARG");; - *) usage >/dev/stderr; return 1;; + *) usage >&2; return 1;; esac done shift $(($OPTIND - 1)) if [[ $# -lt 1 ]]; then error "Must specify a command" - usage >/dev/stderr + usage >&2 return 1 fi mode=$1 if ! in_array "$mode" "${commands[@]}"; then error "Unrecognized command: %s" "$mode" - usage >/dev/stderr + usage >&2 return 1 fi shift @@ -243,14 +243,14 @@ main() { noop|make|sync|delete|update|enter|clean-pkgs|clean-repo) if [[ $# -gt 0 ]]; then error 'Command `%s` does not take any arguments: %s' "$mode" "$*" - usage >/dev/stderr + usage >&2 return 1 fi :;; install-file) if [[ $# -lt 1 ]]; then error 'Command `%s` requires at least one file' "$mode" - usage >/dev/stderr + usage >&2 return 1 else local missing=() @@ -269,14 +269,14 @@ main() { install-name) if [[ $# -lt 1 ]]; then error 'Command `%s` requires at least one package name' "$mode" - usage >/dev/stderr + usage >&2 return 1 fi :;; run) if [[ $# -lt 1 ]]; then error 'Command `%s` requires at least one argument' "$mode" - usage >/dev/stderr + usage >&2 return 1 fi :;; diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index 267d32d..7858611 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -137,7 +137,7 @@ if [[ "${0##*/}" == libreblacklist ]]; then } if [[ $# -eq 0 ]]; then - usage >/dev/stderr + usage >&2 exit 1 fi _blacklist_cmd=$1 diff --git a/src/lib/librelib b/src/lib/librelib index 3b05e37..c21532b 100755 --- a/src/lib/librelib +++ b/src/lib/librelib @@ -89,7 +89,7 @@ main() { return 0; fi done - _l print '%s: could not find library: %s' "$cmd" "$lib" >> /dev/stderr + _l print '%s: could not find library: %s' "$cmd" "$lib" >&2 return 1 } diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 87a55cd..5556ddd 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -161,7 +161,7 @@ main() { dlcmd="${dlcmd//\%o/$(printf '%q' "$dst")}" dlcmd="${dlcmd//\%u/$(printf '%q' "$src")}" - { eval "$dlcmd"; } >> /dev/stderr && return 0 + { eval "$dlcmd"; } >&2 && return 0 fi # Mode: create ######################################################### @@ -173,7 +173,7 @@ main() { export pkg_file=$dst cd "$BUILDFILEDIR" - "$makepkg" "${makepkg_opts[@]}" -p "$srcbuild" >> /dev/stderr || return $? + "$makepkg" "${makepkg_opts[@]}" -p "$srcbuild" >&2 || return $? fi } @@ -235,15 +235,15 @@ parse_options() { :;; checksums|print) # don't take any extra arguments if [[ ${#extra_opts[@]} != 0 ]]; then - print "%s: found extra non-flag arguments: %s" "$cmd" "${extra_opts[*]}" >> /dev/stderr - usage >> /dev/stderr + print "%s: found extra non-flag arguments: %s" "$cmd" "${extra_opts[*]}" >&2 + usage >&2 return 1 fi ;; *download*|*create*) # take 1 or 2 extra arguments if [[ ${#extra_opts[@]} != 1 ]] && [[ ${#extra_opts[@]} != 2 ]]; then - print "%s: %d non-flag arguments found, expected 1 or 2: %s" "$cmd" ${#extra_opts[@]} >> /dev/stderr - usage >> /dev/stderr + print "%s: %d non-flag arguments found, expected 1 or 2: %s" "$cmd" ${#extra_opts[@]} >&2 + usage >&2 return 1 fi ;; |