Improve w530 bookworm setup.

diff --git a/bookworm/setup_scripts/setup.sh b/bookworm/setup_scripts/setup.sh
index 0502de7e39d82f052aad9a8950293f71408512d5..0c28d60c5659169bed9e4866ec8f97e0a218bdc3 100755 (executable)
--- a/bookworm/setup_scripts/setup.sh
+++ b/bookworm/setup_scripts/setup.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-debian_version="bookworm"
 . ./misc.sh
 
 expect_n_args 2 "(hostname, FQDN)" "$@"

diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 216bf7c0160b0d5a43c86a96711c9fe0092d9ef3..41e500f205a0f677ab99554825eb91387bb4e01a 100755 (executable)
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -45,6 +45,5 @@ cd "${setup_scripts_dir}"
 adduser --disabled-password --gecos "" plom
 usermod -a -G sudo plom
 passwd plom
-cp setup_home.sh /home/plom
-cp misc.sh /home/plom
-chown plom:plom /home/plom/*.sh
+cp -a ~/config /home/plom
+chown -R plom:plom /home/plom/config

diff --git a/bookworm/setup_scripts/setup_home.sh b/bookworm/setup_scripts/setup_home.sh
index a2c65da8f5f919f1480cd4b4286b10a1677894d4..55707fd31c36456c3c4e6965981c3b98edb9566b 100755 (executable)
--- a/bookworm/setup_scripts/setup_home.sh
+++ b/bookworm/setup_scripts/setup_home.sh
@@ -1,12 +1,10 @@
 #!/bin/sh
 set -e
-debian_version="bookworm"
-. ./misc.sh
+set -x
 
 expect_n_args 1 "(system name)" "$@"
 get_system_name_arg "$1"
 
-git clone https://plomlompom.com/repos/clone/config
 cd $setup_scripts_dir
 ./copy_dirtree.sh "${config_tree_prefix}/home_files" "${HOME}" minimal user "${system_name}"