diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-12-14 00:33:22 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-12-14 00:33:22 +0100 |
| commit | 8deda84ed86bae6bfa83f5c25d15fd4611c637c0 (patch) | |
| tree | 7cb836c7cfaeacb2669d15b4c50305c474818701 /debian | |
| parent | c1ab34c75f7e98fa1a9686c7bc59e578e1ae9572 (diff) | |
redirect which stderr to /dev/null for consistency
The "standard" which (debianutils) has no output whatsoever on stderr,
bash and dash which use this implementation therefore haven't either.
In zsh 'which' is a shell built-in – and has no stderr output either, it
does print an error message on stdout…
So, realistically, a redirection isn't needed at all, but it also can't
hurt (<- I have said that before in this context ->) so why not for
consistency with… well, not with "command -v" as that hasn't an error
message either. Lets say for consistency with my mental image of shell,
as I am still a bit puzzled by zsh's which and now could imagine even
more strange things in other shells.
Closes: 807373
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 765dd4ae4..d3c9e04c1 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -324,7 +324,7 @@ check_power(){ # 1 (false) System is not on main power # 255 (false) Power status could not be determined # Desktop systems always return 255 it seems - if which on_ac_power >/dev/null; then + if which on_ac_power >/dev/null 2>&1; then on_ac_power POWER=$? if [ $POWER -eq 1 ]; then @@ -352,7 +352,7 @@ if test -r /var/lib/apt/extended_states; then fi # check apt-config existence -if ! which apt-config >/dev/null ; then +if ! which apt-config >/dev/null 2>&1; then exit 0 fi @@ -388,7 +388,7 @@ fi check_power || exit 0 # check if we can lock the cache and if the cache is clean -if which apt-get >/dev/null && ! eval apt-get check $XAPTOPT $XSTDERR ; then +if which apt-get >/dev/null 2>&1 && ! eval apt-get check $XAPTOPT $XSTDERR ; then debug_echo "error encountered in cron job with \"apt-get check\"." exit 0 fi @@ -451,7 +451,7 @@ UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then if eval apt-get $XAPTOPT -y update $XSTDERR; then debug_echo "download updated metadata (success)." - if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then + if which dbus-send >/dev/null 2>&1 && pidof dbus-daemon >/dev/null 2>&1; then if dbus-send --system / app.apt.dbus.updated boolean:true ; then debug_echo "send dbus signal (success)" else @@ -487,7 +487,7 @@ fi # auto upgrade all upgradeable packages UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp -if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then +if which unattended-upgrade >/dev/null 2>&1 && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then if unattended-upgrade $XUUPOPT; then update_stamp $UPGRADE_STAMP debug_echo "unattended-upgrade (success)" |