shellcheck, better automated upgrades

[distro-setup] / primary-setup

diff --git a/primary-setup b/primary-setup
index 30c4222a7bc9c3cdfb6885546a147c4b8225438f..d6c0ed9ec4cf8ea43d64d2312fe0f50a46b23532 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -7,7 +7,7 @@ set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 
-if [[ ! $SUDO_USER || $EUID == 0 ]]; then
+if [[ $EUID == 0 && ! $SUDO_USER ]]; then
   echo "$0: error: requires running as nonroot or sudo"
   exit 1
 fi
@@ -18,7 +18,7 @@ if [[ $1 ]]; then
   source /a/bin/bash_unpublished/source-state
 fi
 
-if [[ $HOSTNAME == $MAIL_HOST ]]; then
+if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
   # arbtt disabled for now
   #DISPLAY=:0 arbtt-capture --sample-rate=10 &
   sudo systemctl start rss2email.timer