diff --git a/bin/hostname b/bin/hostname index 844bbcc6..94deeef7 100755 --- a/bin/hostname +++ b/bin/hostname @@ -24,7 +24,8 @@ if [ "$1" = "--detail" ]; then exit 0 fi -. "$HOME/.$PKG/status" 2>/dev/null || true +. "/etc/$PKG/statusrc" +. "$HOME/.$PKG/status" [ "$whoami" = "1" ] && at="@" printf "\005{+b }%s%s\005{-}" "$at" $(hostname -s 2>/dev/null || hostname) diff --git a/bin/ip_address b/bin/ip_address index 0661a7f6..2d53f3e7 100755 --- a/bin/ip_address +++ b/bin/ip_address @@ -24,7 +24,8 @@ if [ "$1" = "--detail" ]; then exit 0 fi -. "$HOME/.$PKG/status" 2>/dev/null || true +. "/etc/$PKG/statusrc" +. "$HOME/.$PKG/status" [ "$hostname" = "1" ] && space=" " [ "$whoami" = "1" ] && space=" " diff --git a/bin/mem_available b/bin/mem_available index bc6ce469..0226043c 100755 --- a/bin/mem_available +++ b/bin/mem_available @@ -24,7 +24,8 @@ if [ "$1" = "--detail" ]; then exit 0 fi -. "$HOME/.$PKG/status" 2>/dev/null || true +. "/etc/$PKG/statusrc" +. "$HOME/.$PKG/status" [ "$mem_used" = "1" ] && comma="," || whitespace=" " mem=`free | grep -m 1 "^Mem:" | awk '{print $2}'` diff --git a/byobu b/byobu index a0a996d9..72eed69f 100755 --- a/byobu +++ b/byobu @@ -86,7 +86,8 @@ fi [ -s "$HOME/.$PKG/keybindings" ] || echo "source /usr/share/$PKG/keybindings/common" > "$HOME/.$PKG/keybindings" sed -i "s/$OLDPKG/$PKG/g" "$HOME/.$PKG/keybindings" -# Ensure that their default windows are seeded +# Ensure that the user's configuration is seeded +[ -r "$HOME/.$PKG/status" ] || touch "$HOME/.$PKG/status" [ -r "$HOME/.$PKG/windows" ] || touch "$HOME/.$PKG/windows" if grep -qs "^[^#]" "$HOME/.$PKG/windows"; then # User has some default windows, so don't launch motd+shell