From 7af77e92553fa8fa591ee2a5ddf632a0970a7ea7 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Wed, 24 Nov 2021 09:13:58 +0100
Subject: [PATCH] Changed to apt

---
 common/debian/apps/barrier.sh          | 2 +-
 common/debian/apps/boxes.sh            | 2 +-
 common/debian/apps/chrome.sh           | 2 +-
 common/debian/apps/flameshot.sh        | 2 +-
 common/debian/apps/geary.sh            | 2 +-
 common/debian/apps/git.sh              | 2 +-
 common/debian/apps/gnome_shell.sh      | 2 +-
 common/debian/apps/gnome_tweaks.sh     | 2 +-
 common/debian/apps/gpick.sh            | 2 +-
 common/debian/apps/kcolorchooser.sh    | 2 +-
 common/debian/apps/keepassxc.sh        | 2 +-
 common/debian/apps/ncdu.sh             | 2 +-
 common/debian/apps/neofetch.sh         | 2 +-
 common/debian/apps/nextcloud.sh        | 4 ++--
 common/debian/apps/signal.sh           | 2 +-
 common/debian/apps/stacer.sh           | 2 +-
 common/debian/apps/sublime_text.sh     | 6 +++---
 common/debian/apps/timeshift.sh        | 4 ++--
 common/debian/apps/trash-cli.sh        | 2 +-
 common/debian/apps/ulauncher.sh        | 4 ++--
 common/debian/apps/vscode.sh           | 4 ++--
 common/debian/scripts/first_install.sh | 2 +-
 common/debian/scripts/update.sh        | 6 +++---
 common/redhat/scripts/first_install.sh | 6 ++++++
 common/redhat/scripts/update.sh        | 6 ++++++
 25 files changed, 43 insertions(+), 31 deletions(-)
 create mode 100644 common/redhat/scripts/first_install.sh
 create mode 100644 common/redhat/scripts/update.sh

diff --git a/common/debian/apps/barrier.sh b/common/debian/apps/barrier.sh
index e73ad68..61bc427 100644
--- a/common/debian/apps/barrier.sh
+++ b/common/debian/apps/barrier.sh
@@ -2,5 +2,5 @@
 
 install_barrier() {
     echo "Installing barrier"
-    sudo apt-get install barrier -y
+    sudo apt install barrier -y
 }
diff --git a/common/debian/apps/boxes.sh b/common/debian/apps/boxes.sh
index ad3db14..856fbf8 100644
--- a/common/debian/apps/boxes.sh
+++ b/common/debian/apps/boxes.sh
@@ -2,5 +2,5 @@
 
 install_boxes() {
     echo "Installing gnome-boxes"
-    sudo apt-get install gnome-boxes -y
+    sudo apt install gnome-boxes -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/chrome.sh b/common/debian/apps/chrome.sh
index d94996f..77feeb2 100644
--- a/common/debian/apps/chrome.sh
+++ b/common/debian/apps/chrome.sh
@@ -5,5 +5,5 @@ install_chrome() {
     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
     sudo dpkg -i ./google-chrome-stable_current_amd64.deb
     rm google-chrome-stable_current_amd64.deb
-    sudo apt-get install chrome-gnome-shell -y
+    sudo apt install chrome-gnome-shell -y
 }
diff --git a/common/debian/apps/flameshot.sh b/common/debian/apps/flameshot.sh
index 42c0ab4..584d646 100644
--- a/common/debian/apps/flameshot.sh
+++ b/common/debian/apps/flameshot.sh
@@ -2,5 +2,5 @@
 
 install_flameshot() {
     echo "Installing Flameshot"
-    sudo apt-get install flameshot -y
+    sudo apt install flameshot -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/geary.sh b/common/debian/apps/geary.sh
index 5cb56d6..e146f8f 100644
--- a/common/debian/apps/geary.sh
+++ b/common/debian/apps/geary.sh
@@ -2,5 +2,5 @@
 
 install_geary() {
     echo "Installing geary"
-    sudo apt-get install geary -y
+    sudo apt install geary -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/git.sh b/common/debian/apps/git.sh
index 7213847..9b18fe3 100644
--- a/common/debian/apps/git.sh
+++ b/common/debian/apps/git.sh
@@ -2,5 +2,5 @@
 
 install_git() {
     echo "Installing git"
-    sudo apt-get install git -y
+    sudo apt install git -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/gnome_shell.sh b/common/debian/apps/gnome_shell.sh
index e81da8d..2b57caf 100644
--- a/common/debian/apps/gnome_shell.sh
+++ b/common/debian/apps/gnome_shell.sh
@@ -3,6 +3,6 @@
 install_gnome_shell() {
     echo 'Installing gnome-shell'
     if [ $1 == "chrome" ]; then
-        sudo apt-get install chrome-gnome-shell -y
+        sudo apt install chrome-gnome-shell -y
     fi
 }
diff --git a/common/debian/apps/gnome_tweaks.sh b/common/debian/apps/gnome_tweaks.sh
index 3794213..eab34f0 100644
--- a/common/debian/apps/gnome_tweaks.sh
+++ b/common/debian/apps/gnome_tweaks.sh
@@ -2,5 +2,5 @@
 
 install_gnome_tweaks() {
     echo "Installing Gnome-Tweaks"
-    sudo apt-get install gnome-tweaks -y
+    sudo apt install gnome-tweaks -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/gpick.sh b/common/debian/apps/gpick.sh
index 6d0a44a..98d8816 100644
--- a/common/debian/apps/gpick.sh
+++ b/common/debian/apps/gpick.sh
@@ -2,5 +2,5 @@
 
 install_gpick() {
     echo "Installing gpick"
-    sudo apt-get install gpick -y
+    sudo apt install gpick -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/kcolorchooser.sh b/common/debian/apps/kcolorchooser.sh
index 6bbe340..1779d83 100644
--- a/common/debian/apps/kcolorchooser.sh
+++ b/common/debian/apps/kcolorchooser.sh
@@ -2,5 +2,5 @@
 
 install_kcolorchooser() {
     echo "Installing kcolorchooser"
-    sudo apt-get install kcolorchooser -y
+    sudo apt install kcolorchooser -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/keepassxc.sh b/common/debian/apps/keepassxc.sh
index 9f4aa02..9638713 100644
--- a/common/debian/apps/keepassxc.sh
+++ b/common/debian/apps/keepassxc.sh
@@ -2,5 +2,5 @@
 
 install_keepassxc() {
     echo "Installing keepassxc"
-    sudo apt-get install keepassxc -y
+    sudo apt install keepassxc -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/ncdu.sh b/common/debian/apps/ncdu.sh
index 46dbf41..b417915 100644
--- a/common/debian/apps/ncdu.sh
+++ b/common/debian/apps/ncdu.sh
@@ -2,5 +2,5 @@
 
 install_ncdu() {
     echo "Installing ncdu"
-    sudo apt-get install ncdu -y
+    sudo apt install ncdu -y
 }
diff --git a/common/debian/apps/neofetch.sh b/common/debian/apps/neofetch.sh
index 0a61c8f..0d84592 100644
--- a/common/debian/apps/neofetch.sh
+++ b/common/debian/apps/neofetch.sh
@@ -2,7 +2,7 @@
 
 install_neofetch() {
     echo "Installing neofetch"
-    sudo apt-get install neofetch -y
+    sudo apt install neofetch -y
     echo '
 if [ $USER != "root" ]; then
     echo ""
diff --git a/common/debian/apps/nextcloud.sh b/common/debian/apps/nextcloud.sh
index a40f807..a4f5e26 100644
--- a/common/debian/apps/nextcloud.sh
+++ b/common/debian/apps/nextcloud.sh
@@ -3,6 +3,6 @@
 install_nextcloud() {
     echo "Installing Nextcloud client"
     sudo add-apt-repository ppa:nextcloud-devs/client
-    sudo apt-get update
-    sudo apt-get install nextcloud-client -y
+    sudo apt update
+    sudo apt install nextcloud-client -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/signal.sh b/common/debian/apps/signal.sh
index acbb098..f92f185 100644
--- a/common/debian/apps/signal.sh
+++ b/common/debian/apps/signal.sh
@@ -2,5 +2,5 @@
 
 install_signal() {
     echo "Installing signal-desktop "
-    sudo apt-get install signal-desktop -y
+    sudo apt install signal-desktop -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/stacer.sh b/common/debian/apps/stacer.sh
index 97a5ef1..8253ea6 100644
--- a/common/debian/apps/stacer.sh
+++ b/common/debian/apps/stacer.sh
@@ -2,5 +2,5 @@
 
 install_stacer() {
     echo "Installing Stacer"
-    sudo apt-get install stacer -y
+    sudo apt install stacer -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/sublime_text.sh b/common/debian/apps/sublime_text.sh
index 142ed80..fa08f32 100644
--- a/common/debian/apps/sublime_text.sh
+++ b/common/debian/apps/sublime_text.sh
@@ -3,9 +3,9 @@
 install_sublime_text() {
     echo "Installing sublime-text"
     wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo apt-key add -
-    sudo apt-get install apt-transport-https -y
+    sudo apt install apt-transport-https -y
     sudo add-apt-repository "deb https://download.sublimetext.com/ apt/stable/"
     
-    sudo apt-get update
-    sudo apt-get install sublime-text -y
+    sudo apt update
+    sudo apt install sublime-text -y
 }
\ No newline at end of file
diff --git a/common/debian/apps/timeshift.sh b/common/debian/apps/timeshift.sh
index bc2d711..395da1b 100644
--- a/common/debian/apps/timeshift.sh
+++ b/common/debian/apps/timeshift.sh
@@ -3,6 +3,6 @@
 install_timeshift() {
     echo "Installing Timeshift"
     sudo add-apt-repository -y ppa:teejee2008/ppa
-    sudo apt-get update -y
-    sudo apt-get install timeshift -y
+    sudo apt update -y
+    sudo apt install timeshift -y
 }
diff --git a/common/debian/apps/trash-cli.sh b/common/debian/apps/trash-cli.sh
index 4d129a3..07701e9 100644
--- a/common/debian/apps/trash-cli.sh
+++ b/common/debian/apps/trash-cli.sh
@@ -2,5 +2,5 @@
 
 install_trash_cli() {
     echo "Installing trash-cli"
-    sudo apt-get install trash-cli -y   
+    sudo apt install trash-cli -y   
 }
\ No newline at end of file
diff --git a/common/debian/apps/ulauncher.sh b/common/debian/apps/ulauncher.sh
index 19d2dba..ac9dbdb 100644
--- a/common/debian/apps/ulauncher.sh
+++ b/common/debian/apps/ulauncher.sh
@@ -3,6 +3,6 @@
 install_ulauncher() {
     echo "Installing Ulauncher"
     sudo add-apt-repository ppa:agornostal/ulauncher
-    sudo apt-get update -y
-    sudo apt-get install ulauncher -y
+    sudo apt update -y
+    sudo apt install ulauncher -y
 }
diff --git a/common/debian/apps/vscode.sh b/common/debian/apps/vscode.sh
index d153633..a7987a1 100644
--- a/common/debian/apps/vscode.sh
+++ b/common/debian/apps/vscode.sh
@@ -4,6 +4,6 @@ install_vscode() {
     echo "Installing VS Code"
     curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
     sudo add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
-    sudo apt-get update
-    sudo apt-get install code -y
+    sudo apt update
+    sudo apt install code -y
 }
\ No newline at end of file
diff --git a/common/debian/scripts/first_install.sh b/common/debian/scripts/first_install.sh
index f4e641f..9ea8d30 100644
--- a/common/debian/scripts/first_install.sh
+++ b/common/debian/scripts/first_install.sh
@@ -2,5 +2,5 @@
 
 first_install() {
     echo 'Installing useful apps'
-    apt-get install net-tools dnsutils nano htop iftop tree zip unzip curl wget sudo -y
+    apt install net-tools dnsutils nano htop iftop tree zip unzip curl wget git sudo -y
 }
diff --git a/common/debian/scripts/update.sh b/common/debian/scripts/update.sh
index 030350d..833c9c9 100644
--- a/common/debian/scripts/update.sh
+++ b/common/debian/scripts/update.sh
@@ -2,9 +2,9 @@
 
 update() {
     echo 'Starting update:'
-    sudo apt-get update -y
+    sudo apt update -y
     echo 'Starting upgrade:'
-    sudo apt-get upgrade -y
+    sudo apt upgrade -y
     echo 'Starting dist-upgrade:'
-    sudo apt-get dist-upgrade -y
+    sudo apt dist-upgrade -y
 }
diff --git a/common/redhat/scripts/first_install.sh b/common/redhat/scripts/first_install.sh
new file mode 100644
index 0000000..119c571
--- /dev/null
+++ b/common/redhat/scripts/first_install.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+first_install() {
+    echo 'Installing useful apps'
+    dnf install net-tools dnsutils nano htop iftop tree zip unzip curl wget sudo -y
+}
diff --git a/common/redhat/scripts/update.sh b/common/redhat/scripts/update.sh
new file mode 100644
index 0000000..0bdeb75
--- /dev/null
+++ b/common/redhat/scripts/update.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+update() {
+    echo 'Starting upgrade:'
+    sudo dnf upgrade
+}