X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=primary-setup;h=d6c0ed9ec4cf8ea43d64d2312fe0f50a46b23532;hb=343a048be4b32d18540c6531048d2b9a006774ae;hp=22ec48eb9c1b8539895a3c36d9fd6cabb5d27c7c;hpb=f7eaad64a7c5f3bc851f146e1f258d34f398a7d7;p=distro-setup

diff --git a/primary-setup b/primary-setup
index 22ec48e..d6c0ed9 100755
--- a/primary-setup
+++ b/primary-setup
@@ -1,11 +1,16 @@
 #!/bin/bash
 
 # usage $0 [MAIL_HOST]
+# setup things which involve being the primary host or not
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-# setup things which involve being the primary host or not
+
+if [[ $EUID == 0 && ! $SUDO_USER ]]; then
+  echo "$0: error: requires running as nonroot or sudo"
+  exit 1
+fi
 
 if [[ $1 ]]; then
   new_host=$1
@@ -13,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
@@ -33,6 +38,6 @@ else
   # done
 fi
 
-mail-setup
+/a/exe/mail-setup
 exit 0
 :