add youtube-dl and xclip

[instantos/instantOS.git] / install.sh

diff --git a/install.sh b/install.sh
index cb9c0cb..c172e5b 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# central installer script for pb suckless
+# central installer script for instantOS
 
 export PAPERSILENT="True"
 
@@ -44,16 +44,29 @@ userrun() {
     rm /tmp/instantinstall.sh
 }
 
+rootrun() {
+    if [[ "$1" =~ "/" ]]; then
+        RUNSCRIPT="$1"
+    else
+        RUNSCRIPT="$RAW/instantos/instantos/master/$1"
+    fi
+    shift
+    curl -s "$RUNSCRIPT" | bash -s $@
+}
+
 echo "installing dependencies"
-curl -s $RAW/paperbenni/suckless/master/depend.sh | bash
+rootrun depend.sh
+
+echo "root: installing tools"
+rootrun rootinstall.sh "$1"
 
-echo "installing tools"
-curl -s $RAW/paperbenni/suckless/master/rootinstall.sh | bash -s "$1"
-userrun "$RAW/paperbenni/suckless/master/userinstall.sh"
+userrun "$RAW/instantos/instantos/master/userinstall.sh"
 
 echo "installing theme"
 userrun "$RAW/instantOS/instantTHEMES/master/$THEME.sh"
 
 echo "installing dotfiles"
-curl -s $RAW/paperbenni/dotfiles/master/rootinstall.sh | bash
+rootrun $RAW/paperbenni/dotfiles/master/rootinstall.sh
 userrun $RAW/paperbenni/dotfiles/master/userinstall.sh
+
+userrun "$RAW/instantos/instantos/master/userdepend.sh"