better output

[distro-setup] / brc2

diff --git a/brc2 b/brc2
index bff0eb755462d8ee91cd3f31cda1ac340e84db73..fb14eaa76a854fda26146cf4f356126078620606 100644 (file)
--- a/brc2
+++ b/brc2
@@ -118,10 +118,16 @@ bpush() {
   switch-mail-host $HOSTNAME $1 | pee cat "systemd-cat -t switch-mail-host"
 }
 lipush() {
-  rsync $@ --delete-excluded -ahviSAXPH --specials --devices --delete --relative \
-        --exclude-from=/p/c/li-rsync-excludes /a/bin /a/exe /a/h /a/c /p/c/machine_specific/li /a/opt/{emacs,emacs-debianstable,mu} root@li:/
-}
-lipushnoe() {
+  # note, i had --delete-excluded, but that deletes all files in --exclude-from on
+  # the remote site, which doesn't make sense, so not sure why i had it.
+  local p a
+  p=(/a/bin /a/exe /a/h /a/c /p/c/machine_specific/linode{,.hosts} /a/opt/{emacs,emacs-debianstable,mu})
+  a="-ahviSAXPH --specials --devices --delete --relative --exclude-from=/p/c/li-rsync-excludes"
+  rsync $@ $a ${p[@]} root@l2.b8.nz:/
+  rsync $@ $a ${p[@]} /p/c/machine_specific/li root@iankelling.org:/
+  rsync $@ -ahviSAXPH root@iankelling.org:/a/h/proposed-comments/ /a/h/proposed-comments
+}
+lipushnoe() { # noe = noemacs. for running faster.
   rsync $@ --delete-excluded -ahviSAXPH --specials --devices --delete --relative \
         --exclude-from=/p/c/li-rsync-excludes /a/bin /a/exe /a/h /a/c /p/c/machine_specific/li  root@li:/
 }
@@ -233,11 +239,11 @@ dup() {
   ran_d=false
   case $PS1 in
     *DISTRO-BEGIN*)
-      /b/ds/distro-begin
+      /b/ds/distro-begin || return $?
       ran_d=true
       ;;&
     *DISTRO-END*)
-      /b/ds/distro-end
+      /b/ds/distro-end || return $?
       ran_d=true
       ;;&
     *CONFLINK*)
@@ -246,6 +252,7 @@ dup() {
       fi
       ;;
   esac
+  system-status _
 }
 
 envload() { # load environment from a previous: export > file