X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=radicale-setup;h=1d0ca163ca6b80e3cf62f131673021bd14a8daad;hp=3cfaa8225a2b424aed0d33d6f0f54845a401482b;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=f7eaad64a7c5f3bc851f146e1f258d34f398a7d7 diff --git a/radicale-setup b/radicale-setup index 3cfaa82..1d0ca16 100755 --- a/radicale-setup +++ b/radicale-setup @@ -1,6 +1,6 @@ #!/bin/bash -[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@" +[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" if [[ -e /b/errhandle/err ]]; then source /b/errhandle/err @@ -49,15 +49,17 @@ systemctl daemon-reload # not sure this is needed pi-nostart radicale # use persistent uid/gid -IFS=:; read _ _ uid _ < <(getent passwd radicale ); unset IFS -IFS=:; read _ _ gid _ < <(getent group radicale ); unset IFS +IFS=:; read -r _ _ uid _ < <(getent passwd radicale ); unset IFS +IFS=:; read -r _ _ gid _ < <(getent group radicale ); unset IFS if [[ $uid != 609 ]]; then systemctl stop radicale ||: usermod -u 609 radicale groupmod -g 609 radicale usermod -g 609 radicale fi -find /o/radicale /var/log/radicale -xdev -exec chown -h 609 {} + +log_p=/var/log/radicale +[[ -d $log_p ]] || log_p= +find /o/radicale -xdev -exec chown -h 609 {} + find /o/radicale -xdev -exec chgrp -h 609 {} +