From: Ian Kelling Date: Fri, 3 Mar 2023 15:47:47 +0000 (-0500) Subject: fix bad dumb bug X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=ec17ba8d0cabf1d03f7750406ac687873b12e7f0;p=distro-setup fix bad dumb bug --- diff --git a/switch-mail-host b/switch-mail-host index b6959f3..ffff83e 100644 --- a/switch-mail-host +++ b/switch-mail-host @@ -241,8 +241,8 @@ EOF e Running initial btrbk -if ! m btrbk-run -v $bbk_args $incremental_arg $mp_args; then - ret=$? +m btrbk-run -v $bbk_args $incremental_arg $mp_args || ret=$? +if (( ret )); then err "failed initial btrbk" exit $ret fi @@ -260,8 +260,8 @@ if $host2_only; then exit 0 fi -if ! m $old_shell /a/exe/primary-setup $new_hostname; then - ret=$? +m $old_shell /a/exe/primary-setup $new_hostname || ret=$? +if (( ret )); then err "failed \$old_shell primary-setup \$new_hostname. fix and rerun $script_name" exit $ret fi @@ -291,8 +291,8 @@ echo # # shopt -s nullglob; find . -type f -mtime -2 | while read -r f; do a=( /m/4e/Sent/cur/${f%,*}* ); if (( ${#a[@]} )); then e exists $a; else m cp -a $f /m/4e/Sent/cur; fi; done -if ! m $new_shell /a/exe/primary-setup localhost; then - ret=$? +m $new_shell /a/exe/primary-setup localhost || ret=$? +if (( ret )); then err "failed final primary-setup, just fix and rerun: $new_shell /a/exe/primary-setup localhost" exit $ret fi