From b1ef475b093addabc24a468f57e9dd2abd5a0fbc Mon Sep 17 00:00:00 2001
From: Mi Klo <miklo@noreply.localhost>
Date: Sun, 13 Feb 2022 22:54:59 +0100
Subject: [PATCH] (re)created from manual installaton

---
 mx-linux/mx-21.sh | 155 +++++++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 72 deletions(-)

diff --git a/mx-linux/mx-21.sh b/mx-linux/mx-21.sh
index cf40c75..4924ac0 100644
--- a/mx-linux/mx-21.sh
+++ b/mx-linux/mx-21.sh
@@ -1,104 +1,55 @@
 #!/bin/sh
-# custom mx linux 21 configuration (initial copy from 19.4 script )
+# custom mx linux 21 configuration
 # run as:  sudo mx-21.sh -y
+
 apt-get install gnupg software-properties-common
 apt-get update $1
-apt-key adv --keyserver keyserver.ubuntu.com --recv 54B8C8AC
-echo 'deb http://deb.debian.org/debian experimental main' | sudo tee /etc/apt/sources.list.d/experimental.list
-echo 'deb http://ppa.launchpad.net/stefansundin/truecrypt/ubuntu focal main' | sudo tee /etc/apt/sources.list.d/truecrypt.list
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0xFFE1FFFFAFEC55BB
-echo 'deb http://ppa.launchpad.net/atareao/telegram/ubuntu focal main' | sudo tee /etc/apt/sources.list.d/telegram.list
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A3D8A366869FE2DC5FFD79C36A9653F936FD5529
-echo 'deb http://ppa.launchpad.net/sebastian-stenzel/cryptomator/ubuntu focal main' | sudo tee /etc/apt/sources.list.d/cryptomator.list
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CD045438B0D383A4039EA86F892C15CD130FEB9A
-#echo 'deb http://ppa.launchpad.net/inkscape.dev/stable/ubuntu xenial main' | sudo tee /etc/apt/sources.list.d/inkscape.list
-#apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 22C4850146603F3DB0ED00479DA4BD18B9A06DE3
-# echo 'deb http://ftp.debian.org/debian bullseye-backports non-free contrib main' | sudo tee /etc/apt/sources.list.d/debian.list
-curl -s https://brave-browser-apt-release.s3.brave.com/brave-core.asc |  apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser-release.gpg add -
-source /etc/os-release
-echo "deb [arch=amd64] https://brave-browser-apt-release.s3.brave.com/ buster main" | tee /etc/apt/sources.list.d/brave-browser-release-buster.list
-wget -qO - https://eddie.website/repository/keys/eddie_maintainer_gpg.key | apt-key add -
-echo "deb http://eddie.website/repository/apt stable main" | tee /etc/apt/sources.list.d/eddie.website.list
-wget -O- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor > signal-desktop-keyring.gpg
-mv signal-desktop-keyring.gpg /usr/share/keyrings/
-echo 'deb http://download.opensuse.org/repositories/home:/vtrefny/Debian_Unstable/ /' | sudo tee /etc/apt/sources.list.d/home:vtrefny.list
-curl -fsSL https://download.opensuse.org/repositories/home:vtrefny/Debian_Unstable/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_vtrefny.gpg > /dev/null
-#<-- QGiS
-wget -qO - https://qgis.org/downloads/qgis-2021.gpg.key |  gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import
-chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg
-add-apt-repository "deb https://qgis.org/ubuntu $(lsb_release -c -s) main"
-#--> QGiS
-echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/signal-desktop-keyring.gpg] https://updates.signal.org/desktop/apt xenial main' |\
-  sudo tee -a /etc/apt/sources.list.d/signal-xenial.list
-apt-get update $1
-apt-get upgrade $1
-# python 3.9.2 already installed in MX21
-#<-- cpupower  install from main repo
-# apt-get install $1 cpupower-gui
-# install test repo:
-# apt-get install $1 gir1.2-handy-1
+apt-get full-upgrade $1
+
+#<-- cpupower 
+apt-get install $1 cpupower-gui
+apt-get install $1 gir1.2-handy-1
 #--> cpupower
+
 apt-get install $1 net-tools
-# telegram from ppa
-apt-get install $1 telegram
-# signal from ppa
-apt-get install $1 signal-desktop
 apt-get install $1 veracrypt
-# truecrypt from ppa
-apt-get install $1 truecrypt
-# cryptomator from ppa
-apt-get install $1 cryptomator
-# eddie from ppa
-apt-get install $1 eddie-ui
 apt-get install $1 flameshot
 apt-get install $1 inkscape
 apt-get install $1 virtualbox virtualbox-dkms virtualbox-ext-pack virtualbox-guest-additions-iso
 apt-get install $1 obs-studio obs-plugins libobs0
-# install obs-studio from source (with browser) from https://obsproject.com/wiki/install-instructions#debian-based-build-directions
-apt-get install $1 python3-pip
-pip3 install numpy
-pip3 install notebook
-# brave from ppa
-apt-get install $1 brave-browser
+
 #3d mouse
 wget http://ftp.pl.debian.org/debian/pool/main/s/spacenavd/spacenavd_0.7.1-1_amd64.deb
 apt-get install $1 ./spacenavd_0.7.1-1_amd64.deb
+
 apt-get install $1 solaar
 # FFmpeg frontend
 apt-get install $1 winff
+
 apt-get install $1 kdenlive kdenlive-data frei0r-plugins breeze-icon-theme
 apt-get install $1 scrcpy
-wget https://github.com/turtl/desktop/releases/download/v0.7.2.5/turtl-0.7.2.5-linux64.tar.bz2
-tar -xvf turtl-0.7.2.5-linux64.tar.bz2
+apt-get install $1 python3-pip
+apt-get install $1 pipenv
+
+#turtl
+wget https://github.com/turtl/desktop/releases/download/v0.7.2.6-pre-sync-fix/turtl-0.7.2.6-pre-sync-fix-linux64.tar.bz2
+tar -xvf turtl-0.7.2.6-pre-sync-fix-linux64.tar.bz2
 cd turtl-linux64
 ./install.sh
-cd ..
-rm -r turtl-linux64
-# run /opt/turtl/turtl
+
+#vmware player
 # download vmwareplayer: https://my.vmware.com/en/web/vmware/downloads/details?downloadGroup=WKST-PLAYER-1612&productId=1039#product_downloads
-./VMware-Player-16.1.2-17966106.x86_64.bundle
+# ./VMware-Player-16.1.2-17966106.x86_64.bundle
+
 # ecryptfs not available in current repo -> direct download
 wget http://ftp.de.debian.org/debian/pool/main/e/ecryptfs-utils/ecryptfs-utils_111-5_amd64.deb
 wget http://ftp.de.debian.org/debian/pool/main/e/ecryptfs-utils/libecryptfs1_111-5_amd64.deb
 apt-get install $1 ./ecryptfs-utils_111-5_amd64.deb ./libecryptfs1_111-5_amd64.deb
-# wifi mac random address config
-# cp ./30-randomize-mac-address.conf /etc/NetworkManager/conf.d
-# baobab already installed in MX21
+
 apt-get -t experimental install $1 josm
-# qgis from ppa
-apt-get install $1 qgis qgis-plugin-grass qgis-server 
-#<-- nodejs
-curl -sL https://deb.nodesource.com/setup_lts.x | bash -
-apt-get install $1 nodejs
-curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null
-echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list
-apt-get update 
-apt-get install $1 yarn
-#--> nodejs
-# blivet-gui from ppa
-apt-get install $1 blivet-gui
 # extra key mapping for logitech
 apt-get install $1 xbindkeys xautomation xdotool
+
 # droidcam client -> v4l2 , https://www.dev47apps.com/droidcam/linux/
 cd /tmp/
 wget -O droidcam_latest.zip https://files.dev47apps.net/linux/droidcam_1.8.1.zip
@@ -109,3 +60,63 @@ apt-get install $1 linux-headers-`uname -r` gcc make
 ./install-video
 ./install-sound
 cd .. && rm -r ./droidcam*
+
+#<-- nodejs (LTS)
+curl -sL https://deb.nodesource.com/setup_lts.x | bash -
+apt-get install $1 nodejs
+curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null
+echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list
+apt-get update 
+apt-get install $1 yarn
+#--> nodejs
+
+#telegram (from ppa)
+echo 'deb http://ppa.launchpad.net/atareao/telegram/ubuntu focal main' | sudo tee /etc/apt/sources.list.d/telegram.list
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A3D8A366869FE2DC5FFD79C36A9653F936FD5529
+apt-get update
+apt-get install telegram
+
+#signal (from ppa)
+wget -O- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor > signal-desktop-keyring.gpg
+mv signal-desktop-keyring.gpg /usr/share/keyrings/
+echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/signal-desktop-keyring.gpg] https://updates.signal.org/desktop/apt xenial main' |\
+  sudo tee -a /etc/apt/sources.list.d/signal-xenial.list
+apt-get update $1
+apt-get install $1 signal-desktop
+
+#truecrypt (from ppa)
+echo 'deb http://ppa.launchpad.net/stefansundin/truecrypt/ubuntu focal main' | sudo tee /etc/apt/sources.list.d/truecrypt.list
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0xFFE1FFFFAFEC55BB
+apt-get update $1
+apt-get install $1 truecrypt
+
+
+# blivet-gui (repl. for gparted with encryption) https://fedoraproject.org/wiki/Blivet-gui
+echo 'deb http://download.opensuse.org/repositories/home:/vtrefny/Debian_Unstable/ /' | sudo tee /etc/apt/sources.list.d/home:vtrefny.list
+curl -fsSL https://download.opensuse.org/repositories/home:vtrefny/Debian_Unstable/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_vtrefny.gpg > /dev/null
+apt-get update $1
+apt-get install $1 blivet-gui
+
+# brave (from ppa)
+curl -s https://brave-browser-apt-release.s3.brave.com/brave-core.asc |  apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser-release.gpg add -
+source /etc/os-release
+echo "deb [arch=amd64] https://brave-browser-apt-release.s3.brave.com/ bullseye main" | tee /etc/apt/sources.list.d/brave-browser-release.list
+apt-get update $1
+apt-get install $1 brave-browser
+
+# eddie/airvpn (from ppa)
+wget -qO - https://eddie.website/repository/keys/eddie_maintainer_gpg.key | apt-key add -
+echo "deb http://eddie.website/repository/apt stable main" | tee /etc/apt/sources.list.d/eddie.website.list
+apt-get update $1
+apt-get install $1 eddie-ui
+
+#<-- QGiS 3.22 (from ppa)
+wget -qO - https://qgis.org/downloads/qgis-2021.gpg.key |  gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import
+chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg
+add-apt-repository "deb https://qgis.org/ubuntu $(lsb_release -c -s) main"
+apt-get update $1
+apt-get install $1 qgis qgis-plugin-grass qgis-server 
+#--> QGiS
+
+
+