Note: Uses GNU getopt options parsing style
EOF
- exit $1
+ exit 0
}
script_name="${BASH_SOURCE[0]}"
fi
}
-pre="${SSH_CLIENT:+$HOSTNAME} $script_name:"
+pre="$script_name:"
m() { printf "$pre %s\n" "$*"; "$@"; }
e() { printf "$pre %s\n" "$*"; }
err() { echo "$pre ERROR: $*" >&2; }
+die() { printf "%s\n" "$*" >&2; echo "exiting with status 1" >&2; exit 1; }
if [[ $EUID != 0 ]]; then
err "requires running as root"
mail_only=false
host2_only=false
force=false
+force_arg=
pull_reexec=false
mp_args="-m /o,/a,/ar,/q,/qd,/qr"
+check_installed=false
orig_args=("$@")
-temp=$(getopt -l force,pull-reexec,help aioh "$@") || usage 1
+if ! temp=$(getopt -l check-installed,force,pull-reexec,help afioh "$@"); then
+ err "args invalid. args=$*"
+fi
eval set -- "$temp"
while true; do
case $1 in
-a) snapshot_arg=resume ;;
- --force) force=true ;;
+ --force|-f)
+ force=true
+ force_arg=-f
+ ;;
+ --check-installed)
+ check_installed=true
+ ;;
-i) incremental_arg="-i" ;;
# internal option for rerunning under newer old_host when doing pull
--pull-reexec) pull_reexec=true;;
done
-(( $# == 2 )) || usage 1
+if (( $# != 2 )) && ! $check_installed; then
+ err expected 2 args, got $#
+fi
if [[ ! $HOSTNAME ]]; then
err "\$HOSTNAME is unset"
fi
uninstalled-file-die() {
- err "uninstalled file $1. run install-my-scripts or rerun with -f"
- exit 1
+ die "on host=$HOSTNAME, uninstalled file $1. run install-my-scripts or rerun with -f"
}
-if ! $force; then
+
+source /a/bin/bash_unpublished/source-state
+
+direction=$1
+host=$2
+
+
+if ! $force && { $check_installed || [[ $direction == push ]]; } ; then
install_bin_files=(
mount-latest-subvol
check-subvol-stale
if ! diff -q /a/bin/errhandle/err /usr/local/lib/err; then
uninstalled-file-die err
fi
+ if $check_installed; then
+ exit 0
+ fi
fi
-source /a/bin/bash_unpublished/source-state
-direction=$1
-host=$2
case $direction in
push)
old_host=$HOSTNAME
bbk_args="-s $old_host"
old_shell="ssh -F $HOME/.ssh/confighome root@$old_host"
# tests ssh connection. crafted this to not need to do escape chars
- f=/a/bin/bash_unpublished/source-state
- if ! old_info=($($old_shell "hostname; sed -n s,.*MAIL_HOST=,,p $f; sed -n s,.*HOST2=,,p $f")); then
- echo "$pre: error: failed ssh. retrying failed $old_shell with -v for more info:"
- $old_shell -v hostname
- exit 1
- fi
- old_hostname=${old_info[0]}
- MAIL_HOST=${old_info[1]}
- HOST2=${old_info[2]}
if ! $mail_only && ! $pull_reexec ; then
+ if ! $force; then
+ if ! $old_shell switch-mail-host --check-installed; then
+ die "failed: $old_shell switch-mail-host --check-installed"
+ fi
+ fi
tmpf=$(mktemp)
m scp -F $HOME/.ssh/confighome root@$old_host:/usr/local/bin/switch-mail-host $tmpf
if ! diff -q $tmpf ${BASH_SOURCE[0]}; then
e "found different version on old_host=$old_hostname, reexecing"
- install -T $tmpf /usr/local/bin/switch-mail-host
+ m install -T $tmpf /usr/local/bin/switch-mail-host
m /usr/local/bin/switch-mail-host --pull-reexec "${orig_args[@]}"
mexit 0
fi
fi
+ f=/a/bin/bash_unpublished/source-state
+ if ! old_info=$($old_shell "hostname; sed -n s,.*MAIL_HOST=,,p $f; sed -n s,.*HOST2=,,p $f"); then
+ echo "$pre: error: failed ssh. retrying failed $old_shell with -v for more info:"
+ $old_shell -v hostname
+ exit 1
+ fi
+ read -d '' -r old_hostname MAIL_HOST HOST2 <<<"$old_info" || (( $? == 1 ))
+
;;
*)
err invalid first argument
fi
} | $new_shell bash -s
-$old_shell bash -s <<'EOF'
+if ! $mail_only; then
+ $old_shell bash -s <<'EOF'
+set -e
if pgrep -G iank -u iank -f 'emacs --daemon' &>/dev/null; then
bufs="$(sudo -u iank env XDG_RUNTIME_DIR=/run/user/1000 emacsclient --eval "$(cat /a/bin/ds/unsaved-buffers.el)"| sed '/^"nil"$/d;s/^"(/E: /;s/)"$//')"
if [[ $bufs ]]; then
exit 1
fi
fi
+
+# Try to prevent emacs from saving stale data it has in memory to disk. eg: files, recentf list, etc.
+# But if emacs ignores the signal, let it live.
+killall -q emacs ||:
+
+if [[ -e /p/profanity-here ]]; then
+ systemctl disable --now profanity
+fi
EOF
+fi
# previously, I was checking to see if the new mail host
# is on my home network, then changing my home dns
e Running initial btrbk
-m btrbk-run -v $bbk_args $incremental_arg $mp_args $snapshot_arg || ret=$?
+m btrbk-run -v $bbk_args $force_arg $incremental_arg $mp_args $snapshot_arg || ret=$?
if (( ret )); then
err "failed initial btrbk"
exit $ret
m $old_shell systemctl --now disable btrbk.timer
fi
m $new_shell systemctl --now enable btrbk.timer
+ if [[ -e /p/profanity-here ]]; then
+ m $new_shell systemctl --now enable profanity
+ fi
exit 0
fi
exit $ret
fi
-# Try to prevent emacs from saving stale data it has in memory to disk. eg: files, recentf list, etc.
-# But if emacs ignores the signal, let it live.
-m $new_shell killall -q emacs ||:
e Running main btrbk
-m btrbk-run -v --fast $bbk_args $incremental_arg -m /o || ret=$?
+m btrbk-run -v --fast $bbk_args $force_arg $incremental_arg -m /o || ret=$?
if (( ret )); then
bang="$(printf "$(tput setaf 5)█$(tput sgr0)%.0s" 1 2 3 4 5 6 7)"
e $bang failed btrbk of /o. restoring old host as primary
fi
# new system is usable at this point
-printf "$(tput setaf 5 2>/dev/null ||:)█$(tput sgr0 2>/dev/null||:)%.0s" $(eval echo "{1..${COLUMNS:-60}}")
-echo
+blocks=██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
+printf "%s\n" "$(tput setaf 5 2>/dev/null ||:)${blocks:0:${COLUMNS:-180}}$(tput sgr0 2>/dev/null||:)"
# once I accidentally accepted incoming mail on old host. I used this script to copy over that mail:
#
exit $ret
fi
+if ! $mail_only && [[ -e /p/profanity-here ]]; then
+ m $new_shell systemctl --now enable profanity || ret=$?
+ if (( ret )); then
+ err "failed final systemctl --now enable profanity, just fix and rerun"
+ exit $ret
+ fi
+fi
+
m exit 0
iankelling.org / git / distro-setup / blobdiff