diff --git a/mint.sh b/mint.sh index a8d14bd..e24c2d6 100644 --- a/mint.sh +++ b/mint.sh @@ -15,6 +15,8 @@ Nutzung auf einene Gefahr!!! Nur mit Enter/Return fortfahren wenn dieses Skript whoami | grep -q ^root$ || read x +set -x + # Check for using DoHoT if [ -s /etc/dnscrypt-proxy/blocked-names.txt ] then @@ -79,8 +81,13 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade # install ansible -sudo DEBIAN_FRONTEND=noninteractive apt-get -y install python3-pip git -sudo pip install ansible +if grep -q ^RELEASE=22 /etc/linuxmint/info +then + sudo apt-get -y install ansible +else + sudo DEBIAN_FRONTEND=noninteractive apt-get -y install python3-pip git + sudo pip install ansible +fi # install mscore fonts echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections @@ -92,8 +99,6 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y install ttf-mscorefonts-installer sudo sed -i 's/ vera / virginia /g' /etc/apt/sources.list.d/official-package-repositories.list sudo sed -i 's/ vanessa / virginia /g' /etc/apt/sources.list.d/official-package-repositories.list sudo sed -i 's/ victoria / virginia /g' /etc/apt/sources.list.d/official-package-repositories.list -apt-get -y install mintupgrade -#sudo sed -i 's/ virginia / wilma /g' /etc/apt/sources.list.d/official-package-repositories.list # run ansible playbooks for playbook in debian.ansible.basics \ @@ -115,8 +120,9 @@ for playbook in debian.ansible.basics \ do sudo rm -rf ${playbook} git clone https://gitea.${mydomain}/olli/${playbook}.git - sudo ansible-playbook -e ansible_distribution=${DISTRIB_ID} -e ansible_distribution_release=${DISTRIB_CODENAME} --connection=local --inventory $(hostname), --limit $(hostname) ${playbook}/*.yml + sudo ansible-playbook -e ansible_distribution=${DISTRIB_ID} -e ansible_distribution_release=${DISTRIB_CODENAME} --connection=local --inventory $(hostname), --limit $(hostname) ${playbook}/*.yml || exit 1 sudo rm -rf ${playbook} + done sudo bash /usr/local/sbin/autoupdate.sh @@ -124,6 +130,10 @@ sudo bash /usr/local/sbin/autoupdate.sh # Add User to docker group sudo usermod -aG docker ${defaultuser} +# Add User to vboxusers group +sudo usermod -aG vboxusers ${defaultuser} + + # Personal settings with .xsessionrc sudo cat <${defaultuserhome}/.xsessionrc #!/bin/bash