Improve Bookworm server setup config.

[config] / bookworm / setup_scripts / setup_desktop.sh

diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 88b722d87981386656af949033aae1b2712801be..9df55121195d2410b48e3248144fb740043bbb8e 100755 (executable)
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-set -x
 . ./misc.sh
 
 expect_n_args 1 "(system name)" "$@"
@@ -16,8 +15,8 @@ wget "https://download.brother.com/welcome/dlf103566/${ppd_deb}"
 dpkg --add-architecture i386
 apt update
 apt install -y "./${ppd_deb}"
+service cups restart
 # lpadmin -p 'Brother_HLL2350DW' -m 'brother-HLL2350DW-cups-en.ppd'
-# service cups restart
 rm "./${ppd_deb}"
 # TODO explore potential lpadmin options like -o 'OutputMode=NormalGray'
 
@@ -35,7 +34,7 @@ if [ "$system_name" = "w530" ]; then
     wget https://us.download.nvidia.com/XFree86/Linux-x86_64/${driver_version}/${runscript}
     rmmod nouveau
     chmod u+x ${runscript} 
-    ./${runscript} --no-kernel-modules
+    ./${runscript} --no-kernel-modules --silent
     depmod
 fi
 
@@ -45,6 +44,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