From 80423613302f5a61a16c83c3818d5b3575a89928 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 21 Aug 2024 16:07:43 -0400 Subject: [PATCH] docs, minor improvements --- brc3 | 2 +- filesystem/usr/local/bin/btrbk-run | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/brc3 b/brc3 index 4009231..de4a8fe 100644 --- a/brc3 +++ b/brc3 @@ -50,7 +50,7 @@ mmdebstrap-ecne-noble-missing() { done for dist in ecne noble; do # thunderbird is just a way to get rid of its langpacks, since its main package depends on snap - { grep-dctrl -F package -v -r 'ubuntu\|zfs\|thunderbird\|snapd\|microcode\|^linux-' ${!dist} | grep-dctrl -s package -n -F depends,pre-depends -v snapd - ; if [[ $dist == noble ]]; then echo ubuntu-keyring; fi; } | sort >$dist + { grep-dctrl -F package -v -r 'ubuntu\|zfs\|thunderbird\|snapd\|microcode\|^linux-' ${!dist} | grep-dctrl -s package -n -F depends,pre-depends -v snapd - ; if [[ $dist == noble ]]; then echo ubuntu-keyring; fi; } | sort -u >$dist # for just debootstrapped packages: #grep-dctrl -s package -n -F essential -r '^yes$' --or -F priority -r '^required\|important$' ${!dist} | sort >$dist done diff --git a/filesystem/usr/local/bin/btrbk-run b/filesystem/usr/local/bin/btrbk-run index a031313..7df7843 100755 --- a/filesystem/usr/local/bin/btrbk-run +++ b/filesystem/usr/local/bin/btrbk-run @@ -39,9 +39,6 @@ usage() { btrbk-run [OPTIONS] [run|resume|archive] usually -t TARGET_HOST or -s SOURCE_HOST -Note, at source location, intentionally not executable, run and read -install-my-scripts. - EOF echo "top of script file:" sed -n '/^[# ]*begin command line/,/^[# ]*end command line/{p;b};q' "$0" @@ -85,7 +82,7 @@ die() { printf "$pre error: %s\n" "$*" >&2; echo "$pre exiting with status 1" >& mexit() { echo "$pre exiting with status $1"; exit $1; } uninstalled-file-die() { - die "file $1 is not latest. run install-my-scripts or rerun with -f" + die "file $1 is not latest. run conflink or rerun with -f" } set-location() { -- 2.30.2