Fixed for 26.06

download for the device test from git added

autoinstall.sh

@@ -1,27 +1,20 @@
 #! /bin/bash
-# write out to a file and error to different one
+
-LOG="install.log"
 LOG_IN_USER=$(who | awk 'NR==1{print $1;}')
 exec 3>&1
 
 # exec > "$LOG" 2> >(tee -a "$LOG" >&3)
 
 echo "Update" >&3
-sudo apt-get -y -qq \
+sudo apt-get update -y -qq 2>&1 > /dev/null
-  -o Dpkg::Progress-Fancy=0 \
-  -o APT::Color=0 update
 clear
 # install all programms from the install.list
 echo "Installing install.list" >&3
-cat install.list | xargs sudo apt-get -y -qq \
+cat install.list | xargs sudo apt-get install -y -qq 2>&1 > /dev/null
-  -o Dpkg::Progress-Fancy=0 \
-  -o APT::Color=0  install
 clear
 # uninstal all programms from the list
 echo "Uninstalling uninstall.list" >&3
-cat uninstall.list | xargs sudo apt-get -y -qq \
+cat uninstall.list | xargs sudo apt-get purge -y -qq 2>&1 > /dev/null
-  -o Dpkg::Progress-Fancy=0 \
-  -o APT::Color=0 purge
 clear
 # download additional packages 
 echo "Downloading extra packages from Download.list" >&3
@@ -29,33 +22,26 @@ cat download.list | xargs sudo wget -nv 3>&1
 # install the packages
 clear
 echo "Installing all .deb files" >&3
-sudo apt-get -y -qq \
+sudo apt-get -y -qq install ./*.deb 2>&1 > /dev/null
-  -o Dpkg::Progress-Fancy=0 \
-  -o APT::Color=0 install ./*.deb 
-clear
-# set up flatpack
-echo "Setting up flatpack" >&3
-flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo 
 clear
+# set up flatpack - REMOVED
+# echo "Setting up flatpack" >&3
+# flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo 
+# clear
 # install languages by ISO 639-1 short
 echo "Installing additional languages" >&3
 for l in en uk ru ar; do
-	sudo apt-get -y -qq \
+	sudo apt-get -y -qq $(check-language-support -l $l) 2>&1 > /dev/null
-  -o Dpkg::Progress-Fancy=0 \
-  -o APT::Color=0 install $(check-language-support -l $l)
 done
+# quit rustdesk and stop it from starting on boot
 sudo killall rustdesk
+sudo systemctl disable rustdesk.service
+sudo systemctl disable rustdesk
 # clean the system
 echo "Update, Upgrade and cleaning" >&3
-sudo apt-get -y -qq \
+sudo apt-get update -y -qq 2>&1 > /dev/null
-  -o Dpkg::Progress-Fancy=0 \
+sudo apt-get full-upgrade -y -qq 2>&1 > /dev/null
-  -o APT::Color=0 update
+sudo apt-get clean -y -qq 2>&1 > /dev/null
-sudo apt-get -y -qq \
-  -o Dpkg::Progress-Fancy=0 \
-  -o APT::Color=0 full-upgrade
-sudo apt-get -y -qq \
-  -o Dpkg::Progress-Fancy=0 \
-  -o APT::Color=0 clean
 clear
 #set nomacs as default
 echo "setting default programs" >&3
@@ -67,12 +53,15 @@ done
 # copy content of desktop_files to desktop
 
 echo "Copying desktop files" >&3
-cp -r desktop_files/. /home/csr/Schreibtisch/
+cp -r desktop_files/. /home/$LOG_IN_USER/Schreibtisch/
+sudo cp -a settings_fodlers /home/$LOG_IN_USER/
+
+sudo chwon -R "$LOG_IN_USER:$LOG_IN_USER" /home/$LOG_IN_USER/.*
 
 # import panel settings
-echo "setting up desktop UI" >&3
+#echo "setting up desktop UI" >&3
-xfce4-panel-profiles load ./default_panel.tar.bz2
+#xfce4-panel-profiles load ./default_panel.tar.bz2
-clear
+#clear
 # set up firefox
 echo "Install UBlock" >&3
 firefox https://addons.mozilla.org/de/firefox/addon/ublock-origin/ >/dev/null 2>&1 & disown
@@ -94,15 +83,27 @@ xfwm4-settings
 read -p "Continue with Enter" >&3
 clear
 
+echo "Add Keyboard layouts and shortcut" >&3
+xfce4-keyboard-settings
+read -p "Continue with Enter" >&3
+clear
+
 # create skel for new user UI
 echo "Setting up skel" >&3
-sudo mkdir /etc/skel/Schreibtisch
+#sudo mkdir /etc/skel/Schreibtisch
-sudo mkdir /etc/skel/.config
+#sudo mkdir /etc/skel/.config
-sudo mkdir /etc/skel/.local
+#sudo mkdir /etc/skel/.local
-sudo cp -r /home/csr/.config/* /etc/skel/.config/
+#sudo cp -r /home/csr/.config/* /etc/skel/.config/
-sudo cp -r /home/csr/.local/* /etc/skel/.local/
+#sudo cp -r /home/csr/.local/* /etc/skel/.local/
-sudo cp -r /home/csr/Schreibtisch/* /etc/skel/Schreibtisch/
+#sudo cp -r /home/csr/Schreibtisch/* /etc/skel/Schreibtisch/
-
+sudo cp -a /home/$LOG_IN_USER/. /etc/skel/
 sudo chown -R root:root /etc/skel
 
+# set up autotest
+echo "Downloading test from git..."
+sudo wget -P /usr/local/bin/csr_info/ https://git.computerspende-regensburg.de/lucas.lenninger/csr_setup/archive/main.zip 2>&1 > /dev/null
+sudo unzip -j /usr/local/bin/csr_info/main.zip -d /usr/local/bin/csr_info/ 2>&1 > /dev/null
+sudo cp /usr/local/bin/csr_info/CSR_INFOS.desktop /home/$LOG_IN_USER/Scheibtisch/
+clear
+ 
 read -n 1 -s -r -p "Fertig, schließen mit Tastendruck" >&3

install.list

@@ -7,6 +7,7 @@ bleachbit
 chromium-browser
 hplip-gui
 deja-dup
-flatpak
+gnome-snapshot
-gnome-software-plugin-flatpak
+gparted
-cheese
+flameshot
+broadcom-sta-dkms

uninstall.list

@@ -1,2 +1,3 @@
 xfce4-taskmanager
-ristretto
+ristretto
+parole