improve iclone

diff --git a/programs/instantterm b/programs/instantterm
index 2254ea8..c9acc73 100755 (executable)
--- a/programs/instantterm
+++ b/programs/instantterm
@@ -1,6 +1,6 @@
 #!/bin/sh
 test -e ~/.cache/termprograms.txt ||
-    curl https://raw.githubusercontent.com/paperbenni/suckless/master/termprograms.txt >~/.cache/termprograms.txt
+    curl -s https://raw.githubusercontent.com/paperbenni/suckless/master/termprograms.txt >~/.cache/termprograms.txt
 
 STCOMMAND="$(dmenu_path | fgrep -xf ~/.cache/termprograms.txt | dmenu)"
 if [ -n "$STCOMMAND" ]; then

diff --git a/rootinstall.sh b/rootinstall.sh
index e71e608..384310e 100644 (file)
--- a/rootinstall.sh
+++ b/rootinstall.sh
@@ -131,35 +131,27 @@ else
     echo "system is on a desktop"
 fi
 
+echo "the theme is $THEME"
+
 iclone() {
     echo "cloning $1"
     gitclone instantOS/$@ &>/dev/null
+    if [ -e "$1"/build.sh ]; then
+        cd "$1"
+        ./build.sh "$THEME"
+        cd ..
+        rm -rf "$1"
+        cd /tmp/instantosbin
+    fi
 }
 
-rm -rf /tmp/instantos &>/dev/null
-mkdir /tmp/instantos
-cd /tmp/instantos
+rm -rf /tmp/instantosbin &>/dev/null
+mkdir /tmp/instantosbin
+cd /tmp/instantosbin
 
 iclone instantWM
 iclone instantMENU
 iclone instantLOCK
 
-for FOLDER in ./*; do
-    if ! [ -d "$FOLDER" ]; then
-        echo "skipping $FOLDER"
-        continue
-    fi
-    pushd "$FOLDER"
-    if ! [ -e build.sh ]; then
-        rm config.h
-        make &>/dev/null
-        sudo make install &>/dev/null
-    else
-        chmod +x ./build.sh
-        ./build.sh "$THEME" &>/dev/null
-    fi
-    popd
-done
-
 cd /tmp
 rm -rf instantos

diff --git a/userinstall.sh b/userinstall.sh
index 6dd8bb8..5aa063f 100755 (executable)
--- a/userinstall.sh
+++ b/userinstall.sh
@@ -36,7 +36,7 @@ cd
 
 # auto start script with instantWM
 ls .instantos &>/dev/null || mkdir .instantos
-curl $LINK/autostart.sh >.instantos/autostart.sh
+curl -s $LINK/autostart.sh >.instantos/autostart.sh
 chmod +x .instantos/autostart.sh
 
 cd /tmp