home
·
contact
·
privacy
projects
/
config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix variable name.
[config]
/
bookworm
/
setup_scripts
/
misc.sh
diff --git
a/bookworm/setup_scripts/misc.sh
b/bookworm/setup_scripts/misc.sh
index 18fc010aea36cdbf4c204d50f01d986eb3f0e968..641d7522b2031da1476f6ad13742ca7108727bae 100644
(file)
--- a/
bookworm/setup_scripts/misc.sh
+++ b/
bookworm/setup_scripts/misc.sh
@@
-2,7
+2,10
@@
set -e
debian_version="bookworm"
legal_system_names="x220 w530"
set -e
debian_version="bookworm"
legal_system_names="x220 w530"
-config_tree_prefix="${HOME}/config/${debian_version}"
+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"
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
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
}
false
fi
}