diff --git a/autoinstall.sh b/autoinstall.sh index dd1f17e..263c4e4 100755 --- a/autoinstall.sh +++ b/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 \ - -o Dpkg::Progress-Fancy=0 \ - -o APT::Color=0 update +sudo apt-get update -y -qq 2>&1 > /dev/null clear # install all programms from the install.list echo "Installing install.list" >&3 -cat install.list | xargs sudo apt-get -y -qq \ - -o Dpkg::Progress-Fancy=0 \ - -o APT::Color=0 install +cat install.list | xargs sudo apt-get install -y -qq 2>&1 > /dev/null clear # uninstal all programms from the list echo "Uninstalling uninstall.list" >&3 -cat uninstall.list | xargs sudo apt-get -y -qq \ - -o Dpkg::Progress-Fancy=0 \ - -o APT::Color=0 purge +cat uninstall.list | xargs sudo apt-get purge -y -qq 2>&1 > /dev/null clear # download additional packages echo "Downloading extra packages from Download.list" >&3 @@ -29,9 +22,7 @@ cat download.list | xargs sudo wget -nv 3>&1 # install the packages clear echo "Installing all .deb files" >&3 -sudo apt-get -y -qq \ - -o Dpkg::Progress-Fancy=0 \ - -o APT::Color=0 install ./*.deb +sudo apt-get -y -qq install ./*.deb 2>&1 > /dev/null clear # set up flatpack echo "Setting up flatpack" >&3 @@ -40,22 +31,17 @@ 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 \ - -o Dpkg::Progress-Fancy=0 \ - -o APT::Color=0 install $(check-language-support -l $l) + sudo apt-get -y -qq $(check-language-support -l $l) 2>&1 > /dev/null 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 \ - -o Dpkg::Progress-Fancy=0 \ - -o APT::Color=0 update -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 +sudo apt-get update -y -qq 2>&1 > /dev/null +sudo apt-get full-upgrade -y -qq 2>&1 > /dev/null +sudo apt-get clean -y -qq 2>&1 > /dev/null clear #set nomacs as default echo "setting default programs" >&3 @@ -110,4 +96,11 @@ sudo cp -r /home/csr/Schreibtisch/* /etc/skel/Schreibtisch/ 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 +clear + read -n 1 -s -r -p "Fertig, schließen mit Tastendruck" >&3 \ No newline at end of file