From 531b46a3d18d09da698d882ce564e53d31dd72b7 Mon Sep 17 00:00:00 2001
From: paperbenni <paperbenni@gmail.com>
Date: Wed, 29 Jul 2020 10:45:59 +0200
Subject: [PATCH] remove deprecated script

---
 autostart.sh       |  2 +-
 install.sh         | 40 ----------------------------------------
 setup/defaultapps  |  1 +
 setup/instantcheck |  2 +-
 4 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100755 install.sh

diff --git a/autostart.sh b/autostart.sh
index 48f44d8..6e74e44 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -179,7 +179,7 @@ if ! islive; then
 		pkill zenity
 	fi
 
-	cd ~/instantos
+	cd ~/instantos || exit 1
 	if ! iconf -i max; then
 		instantmonitor
 	fi
diff --git a/install.sh b/install.sh
deleted file mode 100755
index 57eac8b..0000000
--- a/install.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# central installer script for instantOS
-# this is deprecated
-
-export PAPERSILENT="True"
-
-if [ $(whoami) = "root" ] || [ $(whoami) = "manjaro" ] || [ $(whoami) = "archiso" ];; then
-    echo "user check successful"
-else
-    echo "please run this as root"
-    exit 1
-fi
-
-RAW="https://raw.githubusercontent.com"
-
-if ! grep -Eiq 'name.*(arch|manjaro)' /etc/os-release; then
-    curl -s "$RAW/instantOS/instantLOGO/master/ascii.txt"
-    echo "warning: distro unsupported"
-fi
-
-REALUSERS="$(ls /home/ | grep -v '+')"
-
-# run a tool as every existing
-# "real"(there's a human behind it) user
-
-userrun() {
-    for i in $REALUSERS; do
-        echo "processing user $i"
-        sudo su "$i" -c "$1"
-    done
-}
-
-echo "installing dependencies"
-/usr/share/instantutils/depend.sh
-
-echo "root: installing tools"
-/usr/share/instantutils/rootinstall.sh
-
-instantthemes f
diff --git a/setup/defaultapps b/setup/defaultapps
index f35c500..7d24f09 100644
--- a/setup/defaultapps
+++ b/setup/defaultapps
@@ -24,4 +24,5 @@ setprogram() {
 
 setprogram terminal st
 setprogram filemanager nautilus
+setprogram systemmonitor mate-system-monitor
 setprogram appmenu appmenu
diff --git a/setup/instantcheck b/setup/instantcheck
index 20234e1..4cd9ac3 100644
--- a/setup/instantcheck
+++ b/setup/instantcheck
@@ -11,7 +11,7 @@ setup() {
         return
     fi
 
-    cd /tmp/instantcheck
+    cd /tmp/instantcheck || exit 1
 
     if ! command -v instantmenu; then
         wget instantmenu.surge.sh/instantmenu
-- 
2.11.0