move monitor files to /opt/instantos/monitor

[instantos/instantOS.git] / userinstall.sh

diff --git a/userinstall.sh b/userinstall.sh
index 5aa063f..bd21042 100755 (executable)
--- a/userinstall.sh
+++ b/userinstall.sh
@@ -4,6 +4,8 @@
 ## installs all instantOS tools            ##
 #############################################
 
+cd "$HOME"
+
 echo "installing instantOS tools"
 
 RAW="https://raw.githubusercontent.com"
@@ -13,25 +15,24 @@ pb git
 
 LINK="$RAW/paperbenni/suckless/master"
 
-curl -s "$LINK/termprograms.txt" >~/.cache/termprograms.txt
+curl -s "$LINK/termprograms.txt" >.cache/termprograms.txt
 
 if ! [ ~/.local/share/fonts/symbola.ttf ]; then
-    mkdir -p ~/.local/share/fonts
-    cd ~/.local/share/fonts
+    mkdir -p .local/share/fonts
+    cd .local/share/fonts
     echo "installing symbola font"
     wget -q "http://symbola.surge.sh/symbola.ttf"
 fi
 
-cd
+cd "$HOME"
 
 # laptop specific stuff
 if acpi | grep -q '[0-9]%' &>/dev/null; then
     # config file to indicate being a laptop
     touch .cache/islaptop
-else
-    curl -s "$RAW/paperbenni/suckless/master/monitor.sh" | bash
 fi
 
+
 cd
 
 # auto start script with instantWM
@@ -57,12 +58,17 @@ mkdir -p paperbenni/notifications &>/dev/null
 # gets executed by dunst on notification
 curl "$RAW/paperbenni/suckless/master/programs/dunsttrigger" >~/paperbenni/notifications/dunsttrigger
 chmod +x ~/paperbenni/notifications/dunsttrigger
-wget -O ~/paperbenni/notifications/notification.ogg "https://notificationsounds.com/notification-sounds/me-too-603/download/ogg"
+
+if ! [ -e ~/paperbenni/notifications/notification.ogg ]; then
+    wget -qO ~/paperbenni/notifications/notification.ogg "https://notificationsounds.com/notification-sounds/me-too-603/download/ogg"
+fi
 
 cd
-mkdir instantos/wallpapers
-curl -s "$RAW/instantOS/instantWALLPAPER/master/wall.sh" >intantos/wallpapers/wall.sh
-chmod +x intantos/wallpapers/wall.sh
+
+rm -rf instantos/wallpapers
+mkdir -p instantos/wallpapers
+curl -s "$RAW/instantOS/instantWALLPAPER/master/wall.sh" >instantos/wallpapers/wall.sh
+chmod +x instantos/wallpapers/wall.sh
 
 # set instantwm as default for lightdm
 echo '[Desktop]' >.dmrc