split instant status

diff --git a/autostart.sh b/autostart.sh
index 10d5ded..096f8b8 100755 (executable)
--- a/autostart.sh
+++ b/autostart.sh
@@ -73,61 +73,6 @@ if [ -n "$ISLAPTOP" ]; then
                libinput-gestures &
        nm-applet &
 fi
-
-INTERNET="X"
-
-REPETITIONS="xxxxxx"
-
 command -v conky &>/dev/null && conky &
 
-date=""
-
-addstatus() {
-       date="$date[$@] "
-}
-
-# status bar loop
-while :; do
-       if [ -e ~/.instantsilent ]; then
-               sleep 1m
-               continue
-       fi
-
-       # run every 60 seconds
-       if [ "$REPETITIONS" = "xxxxxx" ]; then
-               REPETITIONS="x"
-               if ping -q -c 1 -W 1 8.8.8.8; then
-                       INTERNET="i"
-               else
-                       INTERNET="^c#ff0000^X^d^"
-               fi
-
-               # battery indicator on laptop
-               if [ -n "$ISLAPTOP" ]; then
-                       TMPBAT=$(acpi)
-                       if [[ $TMPBAT =~ "Charging" ]]; then
-                               BATTERY="^c#00ff00^B"$(egrep -o '[0-9]*%' <<<"$TMPBAT")"^d^"
-                       else
-                               BATTERY="B"$(egrep -o '[0-9]*%' <<<"$TMPBAT")
-                               # make indicator red on low battery
-                               if [ $(grep '[0-9]*' <<<$BATTERY) -lt 10 ]; then
-                                       BATTERY="^c#ff0000^$BATTERY^d^"
-                               fi
-                       fi
-               fi
-
-       else
-               # increase counter
-               REPETITIONS="$REPETITIONS"x
-       fi
-
-       addstatus "$(date +'%d-%m|%H:%M')"
-       addstatus "A$(amixer get Master | egrep -o '[0-9]{1,3}%' | head -1)"
-       [ -n "$ISLAPTOP" ] && addstatus "$BATTERY"
-       addstatus "$INTERNET"
-
-       xsetroot -name "^f11^$date"
-       date=""
-
-       sleep 10
-done
+source /usr/bin/instantstatus
\ No newline at end of file

diff --git a/status.sh b/status.sh
new file mode 100644 (file)
index 0000000..198ef7f
--- /dev/null
+++ b/status.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+INTERNET="X"
+REPETITIONS="xxxxxx"
+date=""
+
+addstatus() {
+    date="$date[$@] "
+}
+
+# status bar loop
+while :; do
+    if [ -e ~/.instantsilent ]; then
+        sleep 1m
+        continue
+    fi
+
+    # run every 60 seconds
+    if [ "$REPETITIONS" = "xxxxxx" ]; then
+        REPETITIONS="x"
+        if ping -q -c 1 -W 1 8.8.8.8; then
+            INTERNET="i"
+        else
+            INTERNET="^c#ff0000^X^d^"
+        fi
+
+        # battery indicator on laptop
+        if [ -n "$ISLAPTOP" ]; then
+            TMPBAT=$(acpi)
+            if [[ $TMPBAT =~ "Charging" ]]; then
+                BATTERY="^c#00ff00^B"$(egrep -o '[0-9]*%' <<<"$TMPBAT")"^d^"
+            else
+                BATTERY="B"$(egrep -o '[0-9]*%' <<<"$TMPBAT")
+                # make indicator red on low battery
+                if [ $(grep '[0-9]*' <<<$BATTERY) -lt 10 ]; then
+                    BATTERY="^c#ff0000^$BATTERY^d^"
+                fi
+            fi
+        fi
+
+    else
+        # increase counter
+        REPETITIONS="$REPETITIONS"x
+    fi
+
+    addstatus "$(date +'%d-%m|%H:%M')"
+    addstatus "A$(amixer get Master | egrep -o '[0-9]{1,3}%' | head -1)"
+    [ -n "$ISLAPTOP" ] && addstatus "$BATTERY"
+    addstatus "$INTERNET"
+
+    xsetroot -name "^f11^$date"
+    date=""
+
+    sleep 10
+done

diff --git a/userinstall.sh b/userinstall.sh
index 7d1dc90..44fdb44 100755 (executable)
--- a/userinstall.sh
+++ b/userinstall.sh
@@ -38,17 +38,6 @@ cd
 ls .instantos &>/dev/null || mkdir .instantos
 
 cd /tmp
-# drag and drop x utility for ranger
-if ! command -v dragon &>/dev/null; then
-    cd /tmp
-    git clone --depth=1 https://github.com/mwh/dragon.git &>/dev/null
-    cd dragon
-    make
-    make install
-    cd ..
-    rm -rf dragon
-fi
-
 cd
 mkdir -p instantos/notifications &>/dev/null
 cd instantos/notifications