diff --git a/autoinstall.sh b/autoinstall.sh index 263c4e4..49a0d57 100755 --- a/autoinstall.sh +++ b/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 \ No newline at end of file diff --git a/desktop_files/Infos zum Betriebssystem Xubuntu 24.pdf b/desktop_files/Infos zum Betriebssystem Xubuntu 26.pdf old mode 100644 new mode 100755 similarity index 74% rename from desktop_files/Infos zum Betriebssystem Xubuntu 24.pdf rename to desktop_files/Infos zum Betriebssystem Xubuntu 26.pdf index 3b7e90c..92e021c Binary files a/desktop_files/Infos zum Betriebssystem Xubuntu 24.pdf and b/desktop_files/Infos zum Betriebssystem Xubuntu 26.pdf differ diff --git a/install.list b/install.list index e310ac8..5278993 100644 --- a/install.list +++ b/install.list @@ -7,7 +7,7 @@ bleachbit chromium-browser hplip-gui deja-dup -flatpak -gnome-software-plugin-flatpak -cheese -gparted \ No newline at end of file +gnome-snapshot +gparted +flameshot +broadcom-sta-dkms \ No newline at end of file diff --git a/uninstall.list b/uninstall.list index 773c8b9..57becf5 100644 --- a/uninstall.list +++ b/uninstall.list @@ -1,2 +1,3 @@ xfce4-taskmanager -ristretto \ No newline at end of file +ristretto +parole \ No newline at end of file