X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=bookworm%2Fsetup_scripts%2Fmisc.sh;h=4aad4a416eff402070a4717ad1ff170bf75b762e;hb=27b66e55c2dadbe3f1014aaf20949a16273efeed;hp=18fc010aea36cdbf4c204d50f01d986eb3f0e968;hpb=c23514e257843acb215e435b2da06a24c11f39dd;p=config
diff --git a/bookworm/setup_scripts/misc.sh b/bookworm/setup_scripts/misc.sh
index 18fc010..4aad4a4 100644
--- a/bookworm/setup_scripts/misc.sh
+++ b/bookworm/setup_scripts/misc.sh
@@ -1,8 +1,11 @@
#!/bin/sh
set -e
debian_version="bookworm"
-legal_system_names="x220 w530"
-config_tree_prefix="${HOME}/config/${debian_version}"
+legal_system_names="x220 w530 h610m"
+config_tree_prefix="${HOME}/public_repos/config/${debian_version}"
+if [ ! -d "${config_tree_prefix}" ]; then
+ config_tree_prefix="${HOME}/config/${debian_version}"
+fi
setup_scripts_dir="${config_tree_prefix}/setup_scripts"
aptmark_dir="${config_tree_prefix}/apt-mark"
@@ -11,7 +14,16 @@ expect_n_args() {
explainer="$2"
shift 2
if [ "$#" -lt "${min_args}" ]; then
- echo "Need at least $1 arguments ⦠${explainer}"
+ echo "Need at least ${1} arguments ⦠${explainer}"
+ false
+ fi
+}
+
+expect_setup_finished_file() {
+ filename="$1"
+ setup_script="$2"
+ if [ ! -f "${HOME}/${filename}" ]; then
+ echo "First need to run ${setup_script}."
false
fi
}