From 0a6836a8e5ba29f16946b43518047d3ba65ed4c5 Mon Sep 17 00:00:00 2001
From: Sven Heidemann <edraft.sh@gmail.com>
Date: Sat, 6 Mar 2021 15:18:01 +0100
Subject: [PATCH] Improved scripts for server uses

---
 default/install.sh      | 12 +-----------
 desktop/install.sh      | 20 ++++++++++++++++++++
 desktop_installation.sh |  9 +++++++++
 3 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 desktop/install.sh
 create mode 100644 desktop_installation.sh

diff --git a/default/install.sh b/default/install.sh
index 7c030e9..5b65b8d 100644
--- a/default/install.sh
+++ b/default/install.sh
@@ -1,22 +1,12 @@
 #!/bin/bash
 
-source $PWD/apps/chrome.sh
-source $PWD/apps/etcher.sh
 source $PWD/apps/lsd.sh
-source $PWD/apps/timeshift.sh
-source $PWD/apps/ulauncher.sh
 
 default_install() {
     echo 'Installing:'
 
-    sudo apt-get install net-tools htop tree zip unzip neofetch stacer gnome-tweaks trash-cli ncdu flameshot -y
+    sudo apt-get install net-tools htop tree zip unzip neofetch trash-cli ncdu -y
     sudo echo "neofetch" >> /home/*/.bashrc
 
-    sudo snap install simplenote
-
-    install_chrome
-    install_etcher
     install_lsd
-    install_timeshift
-    install_ulauncher
 }
diff --git a/desktop/install.sh b/desktop/install.sh
new file mode 100644
index 0000000..02b8179
--- /dev/null
+++ b/desktop/install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+source $PWD/apps/chrome.sh
+source $PWD/apps/etcher.sh
+source $PWD/apps/timeshift.sh
+source $PWD/apps/ulauncher.sh
+
+desktop_install() {
+    echo 'Installing:'
+
+    sudo apt-get install stacer gnome-tweaks flameshot -y
+
+    sudo snap install simplenote
+    
+    install_timeshift
+    install_ulauncher
+    install_chrome
+    install_etcher
+
+}
\ No newline at end of file
diff --git a/desktop_installation.sh b/desktop_installation.sh
new file mode 100644
index 0000000..5bfc179
--- /dev/null
+++ b/desktop_installation.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source $PWD/default/update.sh
+source $PWD/default/install.sh
+source $PWD/desktop/install.sh
+
+update
+default_install
+desktop_install