Fixed for 26.06

autoinstall.sh

@@ -24,10 +24,10 @@ clear
 echo "Installing all .deb files" >&3
 sudo apt-get -y -qq install ./*.deb 2>&1 > /dev/null
 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
@@ -53,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
-xfce4-panel-profiles load ./default_panel.tar.bz2
-clear
+#echo "setting up desktop UI" >&3
+#xfce4-panel-profiles load ./default_panel.tar.bz2
+#clear
 # set up firefox
 echo "Install UBlock" >&3
 firefox https://addons.mozilla.org/de/firefox/addon/ublock-origin/ >/dev/null 2>&1 & disown
@@ -87,20 +90,20 @@ clear
 
 # create skel for new user UI
 echo "Setting up skel" >&3
-sudo mkdir /etc/skel/Schreibtisch
-sudo mkdir /etc/skel/.config
-sudo mkdir /etc/skel/.local
-sudo cp -r /home/csr/.config/* /etc/skel/.config/
-sudo cp -r /home/csr/.local/* /etc/skel/.local/
-sudo cp -r /home/csr/Schreibtisch/* /etc/skel/Schreibtisch/
-
+#sudo mkdir /etc/skel/Schreibtisch
+#sudo mkdir /etc/skel/.config
+#sudo mkdir /etc/skel/.local
+#sudo cp -r /home/csr/.config/* /etc/skel/.config/
+#sudo cp -r /home/csr/.local/* /etc/skel/.local/
+#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
-cp /usr/local/bin/csr_info/CSR_INFOS.desktop ~/Scheibtisch
+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