X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=1cefd0bd3f7bad668d25e380b717c80a51689b7e;hb=b28eebdf9143aa17733f233b30b96f462008f3b6;hp=0e42e66613421055a46261f12fd21967df391e27;hpb=95eb9558206f8287febab80dd3f51d168a3ca831;p=distro-setup

diff --git a/conflink b/conflink
index 0e42e66..1cefd0b 100755
--- a/conflink
+++ b/conflink
@@ -18,10 +18,10 @@ EOF
 }
 
 
+s() { sudo "$@"; }
 m() {
   "$@"
 }
-s() { sudo "$@"; }
 v() {
   echo "$*"
   "$@"
@@ -219,7 +219,7 @@ case $user in
       m s chgrp -R bind $f
       m s chmod g+w $f
     fi
-    sudo bash -c 'shopt -s nullglob; for f in /etc/bind/*.key /etc/bind/*.private /etc/bind/key.*; do chgrp bind $f; done'
+    s bash -c 'shopt -s nullglob; for f in /etc/bind/*.key /etc/bind/*.private /etc/bind/key.*; do chgrp bind $f; done'
     if [[ -e /etc/caldav-htpasswd ]] && getent group www-data &>/dev/null; then
       s chgrp www-data /etc/caldav-htpasswd
     fi
@@ -245,7 +245,7 @@ case $user in
     ##### end special extra stuff #####
 
     if ! $fast; then
-      m sudo -H -u user2 "${BASH_SOURCE[0]}"
+      m s -H -u user2 "${BASH_SOURCE[0]}"
     fi
 
     f=/a/bin/distro-setup/system-status