Merge pull request #16 from cobaltgit/coulomb-dev

Coulomb

Author: cobaltgit

Apps/BootLogo/launch.sh

@@ -1,20 +1,23 @@
 #!/bin/sh
 
+. /mnt/SDCARD/System/scripts/helpers.sh
+
 cd "$(dirname "$0")"
 
 BOOTLOGO_MAX_BYTES=524288 # 512KiB
 BOOTLOGO="bootlogo.bmp"
 LOG_FILE="/mnt/SDCARD/System/log/bootlogo.log"
 
 if [ $(wc -c <$BOOTLOGO) -gt $BOOTLOGO_MAX_BYTES ]; then
-    echo "BootLogo: image must not be greater than $BOOTLOGO_MAX_BYTES bytes" > "$LOG_FILE"
+    echo "BootLogo: must be 512KiB or smaller" >> "$LOG_FILE"
+    display -d 2000 -t "Boot logo must be 512KiB or smaller. Exiting..."
     exit 1
 fi
 
-echo "BootLogo: writing $BOOTLOGO" > "$LOG_FILE"
-dd if=$BOOTLOGO of=/dev/by-name/bootlogo bs=65536 > "$LOG_FILE" 2>&1
+display -t "Updating bootlogo..."
+dd if=$BOOTLOGO of=/dev/by-name/bootlogo bs=65536 >> "$LOG_FILE" 2>&1
 if [ $? -eq 0 ]; then
-    echo "BootLogo: replacement success!" > "$LOG_FILE"
+    display -d 2000 -t "Boot logo update success."
 else
-    echo "BootLogo: replacement failed!" > "$LOG_FILE"
-fi
+    display -d 2000 -t "Boot logo update failed. Check the log for more details."
+fi

Apps/EmuClean/launch.sh

@@ -5,9 +5,13 @@
 . /mnt/SDCARD/System/scripts/helpers.sh
 
 EMU_DIR="/mnt/SDCARD/Emus"
+SHOWN_COUNT=0
+HIDDEN_COUNT=0
 
 set_cpuclock --mode performance
 
+display -t "Refreshing displayed emulators..."
+
 for EMU in "$EMU_DIR"/*; do
     if [ -d "$EMU" ]; then
         EXTENSIONS="$(awk -F ':' '/extlist/ {print $2}' "$EMU/config.json" | sed 's/^[[:space:]]*//; s/[",]//g')" # no jq? no problem. might add it later down the line though
@@ -17,11 +21,15 @@ for EMU in "$EMU_DIR"/*; do
         if [ "$ROM_COUNT" -eq 0 ]; then
             echo "EmuClean: no roms, hiding $EMU"
             sed -i 's/^{*$/{{/' "$EMU/config.json" # break config.json so emulator doesn't show
+            HIDDEN_COUNT=$((HIDDEN_COUNT + 1))
         elif [ "$ROM_COUNT" -gt 0 ]; then
             echo "EmuClean: $ROM_COUNT roms detected in system $EMU, showing"
             sed -i 's/^{{*$/{/' "$EMU/config.json" # fix config.json to show emulator
+            SHOWN_COUNT=$((SHOWN_COUNT + 1))
         fi
     fi
 done
 
+display -d 2000 -t "Done! $SHOWN_COUNT systems shown, $HIDDEN_COUNT systems hidden"
+
 set_cpuclock --mode smart # reset cpu clock

Apps/Reboot/bg.png

@@ -1,14 +1,7 @@
 #!/bin/sh
-echo $0 $*
-progdir=`dirname "$0"`
-cd $progdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$progdir
 
-echo "=============================================="
-echo "================== reboot  ==================="
-echo "=============================================="
+. /mnt/SDCARD/System/scripts/helpers.sh
 
-chmod 777 reboot_wait
-./reboot_wait&
-sleep 1
-reboot
+display -d 2000 -t "Rebooting your Smart..."
+
+reboot

Apps/Reboot/launch.sh

@@ -9,10 +9,12 @@ SSH_APP_CONFIG="/mnt/SDCARD/Apps/SSH/config.json"
 IP="$(ip addr show wlan0 | awk '/inet[^6]/ {split($2, a, "/"); print a[1]}')"
 
 if $SSH_ENABLED; then
+    display -d 1000 -t "Disabling SSH..."
     SSH_ENABLED=false
     echo -E "$(/mnt/SDCARD/System/bin/jq '.description = "Turned off"' "$SSH_APP_CONFIG")" > "$SSH_APP_CONFIG"
     stop_dropbear_process
 else
+    display -d 1000 -t "Enabling SSH..."
     SSH_ENABLED=true
     if [ -z "$IP" ]; then
         DESCRIPTION="Not connected"
@@ -23,4 +25,6 @@ else
     start_dropbear_process
 fi
 
-update_setting "network" "ssh" "$SSH_ENABLED"
+update_setting "network" "ssh" "$SSH_ENABLED"
+
+kill_display

Apps/Reboot/reboot_wait

@@ -9,10 +9,12 @@ SYNCTHING_APP_CONFIG="/mnt/SDCARD/Apps/Syncthing/config.json"
 IP="$(ip addr show wlan0 | awk '/inet[^6]/ {split($2, a, "/"); print a[1]}')"
 
 if $SYNCTHING_ENABLED; then
+    display -d 1000 -t "Disabling Syncthing..."
     SYNCTHING_ENABLED=false
     echo -E "$(/mnt/SDCARD/System/bin/jq '.description = "Turned off"' "$SYNCTHING_APP_CONFIG")" > "$SYNCTHING_APP_CONFIG"
     stop_syncthing_process
 else
+    display -d 1000 -t "Enabling Syncthing..."
     SYNCTHING_ENABLED=true
     if [ -z "$IP" ]; then
         DESCRIPTION="Not connected"
@@ -23,4 +25,6 @@ else
     start_syncthing_process
 fi
 
-update_setting "network" "syncthing" "$SYNCTHING_ENABLED"
+update_setting "network" "syncthing" "$SYNCTHING_ENABLED"
+
+kill_display

Apps/SSH/launch.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 . /mnt/SDCARD/System/scripts/helpers.sh
 . /mnt/SDCARD/System/scripts/networkHelpers.sh
 
@@ -9,10 +11,12 @@ DUFS_APP_CONFIG="/mnt/SDCARD/Apps/WifiFileTransferToggle/config.json"
 IP="$(ip addr show wlan0 | awk '/inet[^6]/ {split($2, a, "/"); print a[1]}')"
 
 if $DUFS_ENABLED; then
+    display -d 1000 -t "Disabling dufs..."
     DUFS_ENABLED=false
     echo -E "$(/mnt/SDCARD/System/bin/jq '.description = "Turned off"' "$DUFS_APP_CONFIG")" > "$DUFS_APP_CONFIG"
     stop_dufs_process
 else
+    display -d 1000 -t "Enabling dufs..."
     DUFS_ENABLED=true
     if [ -z "$IP" ]; then
         DESCRIPTION="Not connected"
@@ -23,4 +27,6 @@ else
     start_dufs_process
 fi
 
-update_setting "network" "dufs" "$DUFS_ENABLED"
+update_setting "network" "dufs" "$DUFS_ENABLED"
+
+kill_display

Apps/Syncthing/launch.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. /mnt/SDCARD/System/scripts/helpers.sh
+
 EMU="$(echo "$1" | cut -d'/' -f5)"
 CONFIG="/mnt/SDCARD/Emus/${EMU}/config.json"
 OPT="/mnt/SDCARD/Emus/.emu_setup/opts/${EMU}.opt"
@@ -22,4 +24,6 @@ case "$CPU_MODE" in
 esac
 
 sed -i "s|\"CPU:.*\"|\"CPU: $NEW_DISPLAY\"|g" "$CONFIG"
-sed -i "s|CPU_MODE=.*|CPU_MODE=\"$NEW_MODE\"|g" "$OPT"
+sed -i "s|CPU_MODE=.*|CPU_MODE=\"$NEW_MODE\"|g" "$OPT"
+
+display -d 1000 -t "CPU mode for $EMU set to $NEW_MODE."

Apps/WifiFileTransferToggle/launch.sh

@@ -1,7 +1,11 @@
 #!/bin/sh
 
+. /mnt/SDCARD/System/scripts/helpers.sh
+
 EMU="$(echo "$1" | cut -d'/' -f5)"
 GAME="$(basename "$1")"
 OVERRIDE_FILE="/mnt/SDCARD/Emus/.emu_setup/overrides/${EMU}/${GAME}.opt"
 
-rm -f "$SYS_OPT" "$OVERRIDE_FILE"
+rm -f "$SYS_OPT" "$OVERRIDE_FILE"
+
+display -d 1000 -t "Deleted CPU override for game $GAME"