ipv6 tunnel

[distro-setup] / primary-setup

diff --git a/primary-setup b/primary-setup
index 1a6ce0e05158124c1078040fdf24b1ab7f6cf068..d6c0ed9ec4cf8ea43d64d2312fe0f50a46b23532 100755 (executable)
--- 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