various fixes

[distro-setup] / rootsshsync

diff --git a/rootsshsync b/rootsshsync
index d3e860b30c0109c38a32f78f0d2a32641d0fa921..5be639c8387d64e18d7d1cd70c683c9622a767ae 100755 (executable)
--- a/rootsshsync
+++ b/rootsshsync
@@ -19,12 +19,14 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
 if test -e /q/root/.ssh; then
-    /a/exe/lnf /q/root/.ssh /root
+    dest=/q/root/.ssh
+    /a/exe/lnf $dest /root
 else
+    dest=/root/.ssh
     mkdir -p /root/.ssh
     chmod 700 /root/.ssh
 fi
 # -t times, so it won't rewrite the file every time,
 # -L resolve links
-rsync -rtL $(eval echo ~${SUDO_USER:-$USER})/.ssh /root
+rsync -rtL --delete $(eval echo ~${SUDO_USER:-$USER})/.ssh/ $dest
 chown -R root:root /root/.ssh