Fix starttab on device change

cizia64 · Jan 9, 2025 · f3a0d3e · f3a0d3e
1 parent 7e81bdf
commit f3a0d3e
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 26 deletions.
diff --git a/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 1.sh b/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 1.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-source "$(dirname "$0")"/.switcher.sh
+source /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh
diff --git a/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 2.sh b/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 2.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-source "$(dirname "$0")"/.switcher.sh
+source /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh
diff --git a/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 3.sh b/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 3.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-source "$(dirname "$0")"/.switcher.sh
+source /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh
diff --git a/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 4.sh b/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 4.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-source "$(dirname "$0")"/.switcher.sh
+source /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh
diff --git a/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 5.sh b/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 5.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-source "$(dirname "$0")"/.switcher.sh
+source /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh
diff --git a/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 6.sh b/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 6.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-source "$(dirname "$0")"/.switcher.sh
+source /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh
diff --git a/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 7.sh b/Apps/SystemTools/Menu/USER INTERFACE##START TAB (value)/Tab 7.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-source "$(dirname "$0")"/.switcher.sh
+source /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh
diff --git a/System/starts/°customization.sh b/System/starts/°customization.sh
@@ -154,7 +154,10 @@ if [ -f "/tmp/device_changed" ]; then
         sed -i 's/^ScreenHeight =.*$/ScreenHeight = 720' $n64_conf
     fi
 
-    /mnt/SDCARD/System/usr/trimui/scripts/overlays_switcher.sh
+    /mnt/SDCARD/System/usr/trimui/scripts/inputd_switcher.sh -s
+    /mnt/SDCARD/System/usr/trimui/scripts/starttab_switcher.sh -s
+    /mnt/SDCARD/System/usr/trimui/scripts/overlays_switcher.sh -s
+
 
 	# manage theme differences
 	themes_dir="/mnt/SDCARD/Themes"

diff --git a/System/starts/°post_starts.sh b/System/starts/°post_starts.sh
@@ -1,10 +1,6 @@
 PATH="/mnt/SDCARD/System/bin:$PATH"
 export LD_LIBRARY_PATH="/mnt/SDCARD/System/lib:/mnt/SDCARD/System/lib/samba:/mnt/SDCARD/Apps/PortMaster/PortMaster:/usr/trimui/lib:$LD_LIBRARY_PATH"
 
-if [ -f /tmp/device_changed ]; then
-    /mnt/SDCARD/System/usr/trimui/scripts/inputd_switcher.sh
-fi
-
 # Swap A B
 SWAP_AB_enabled=$(/mnt/SDCARD/System/bin/jq -r '["SWAP A B"]' "/mnt/SDCARD/System/etc/crossmix.json")
 if [ "$SWAP_AB_enabled" -eq 1 ]; then

diff --git a/System/usr/trimui/scripts/inputd_switcher.sh b/System/usr/trimui/scripts/inputd_switcher.sh
@@ -6,6 +6,7 @@ script_name=$(basename "$0" .sh)
 if [ "$script_name" = "inputd_switcher" ]; then
     polling_rate=$(/mnt/SDCARD/System/bin/jq -r '.["POLLING RATE"]' "/mnt/SDCARD/System/etc/crossmix.json")
 else
+    [ "$1" != "-s" ] && /mnt/SDCARD/System/usr/trimui/scripts/infoscreen.sh -m "Applying $polling_rate polling rate..." -t 1
     polling_rate=$script_name
 fi
 
@@ -64,6 +65,5 @@ jq --arg polling_rate "$polling_rate" '. += {"POLLING RATE": $polling_rate}' "$j
 # update database of "System Tools" database
 /mnt/SDCARD/System/usr/trimui/scripts/mainui_state_update.sh "POLLING RATE" "$polling_rate"
 
-/mnt/SDCARD/System/usr/trimui/scripts/infoscreen.sh -m "Applying $polling_rate polling rate..." -t 1
 pkill trimui_inputd
 pkill -KILL MainUI
diff --git a/System/usr/trimui/scripts/overlays_switcher.sh b/System/usr/trimui/scripts/overlays_switcher.sh
@@ -4,9 +4,9 @@ PATH="/mnt/SDCARD/System/bin:$PATH"
 LD_LIBRARY_PATH="/mnt/SDCARD/System/lib:/usr/trimui/lib:$LD_LIBRARY_PATH"
 script_name="$(basename "$0" .sh)"
 if [ "$script_name" = "overlays_switcher" ]; then
-    script_name=$(/mnt/SDCARD/System/bin/jq -r '.["OVERLAYS"]' "/mnt/SDCARD/System/etc/crossmix.json")
-else
-    [ "$1" != "-s" ] && /mnt/SDCARD/System/usr/trimui/scripts/infoscreen.sh -m "Applying \"$(basename "$0" .sh)\" by default..."
+    script_name=$(jq -r '.["OVERLAYS"]' "/mnt/SDCARD/System/etc/crossmix.json")
+elif [ "$1" != "-s" ]; then
+    /mnt/SDCARD/System/usr/trimui/scripts/infoscreen.sh -m "Applying \"$(basename "$0" .sh)\" by default..."
 fi
 
 ratio=$(echo "${script_name#*- }" | tr ' ' '-')

diff --git a/...INTERFACE##START TAB (value)/.switcher.sh → ...m/usr/trimui/scripts/starttab_switcher.sh b/...INTERFACE##START TAB (value)/.switcher.sh → ...m/usr/trimui/scripts/starttab_switcher.sh
@@ -2,17 +2,10 @@
 PATH="/mnt/SDCARD/System/bin:$PATH"
 LD_LIBRARY_PATH="/mnt/SDCARD/System/lib:/usr/trimui/lib:$LD_LIBRARY_PATH"
 
-silent=false
-for arg in "$@"; do
-  if [ "$arg" = "-s" ]; then
-    silent=true
-    break
-  fi
-done
-
 script_name=$(basename "$0" .sh)
-
-if [ "$silent" = false ]; then
+if [ "$script_name" = starttab_switcher ]; then
+    script_name=$(jq -r '.["START TAB"]' /mnt/SDCARD/System/etc/crossmix.json);
+elif [ "$1" != "-s" ]; then
   /mnt/SDCARD/System/usr/trimui/scripts/infoscreen.sh -m "$script_name by default."
 fi