From 924c54c6a6c196844c94380603283c9b4d698698 Mon Sep 17 00:00:00 2001
From: Ludicro <65253062+Ludicro@users.noreply.github.com>
Date: Fri, 28 Feb 2025 15:31:36 -0500
Subject: [PATCH] Fixed run errors for runpayload.sh on windows

I didn't test if the issues happened on UNIX boxes, but any attempt to use this before would cause unreadable USB errors on windows. It works the same from the payload side, but works now
---
 payloads/extensions/runpayload.sh | 32 +++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/payloads/extensions/runpayload.sh b/payloads/extensions/runpayload.sh
index 700c1f7f0..3a4600fde 100755
--- a/payloads/extensions/runpayload.sh
+++ b/payloads/extensions/runpayload.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#Payload selector by Dragonkeeper
+#Payload selector by Dragonkeeper and edited by Ludicro
 #  Allows selecting payloads by amount of switch changes
 #
 #Step1. put all your payloads into a folder
@@ -9,6 +9,7 @@
 #scriptfolder=" /root/udisk/payloads/payloads/ "
 #script1="payload1.txt"
 #script2="payload2.txt"
+# Be sure to include the trailing spaces on either end
 #
 #Step3. now call the extension as with the payloads you would like to use 
 #RUN_PAYLOAD $scriptfolder $script1 $script2 $script3 $script4
@@ -24,21 +25,48 @@
 # This will let you add as many payloads as you desire.
 
 function RUN_PAYLOAD() {
+    # Add debug logging
+    #echo "RUN_PAYLOAD started at $(date)" >> /root/udisk/extensions/debug/runpayload_debug.log
+    #echo "Number of arguments: $#" >> /root/udisk/extensions/debug/runpayload_debug.log
+    #echo "Arguments received: $@" >> /root/udisk/extensions/debug/runpayload_debug.log
+
     payloadcount=$#
     payloadarray=("$@")
     PAYLOAD=1
+
+    #echo "Payload count: $payloadcount" >> /root/udisk/extensions/debug/runpayload_debug.log
+    #echo "Payload array contents:" >> /root/udisk/extensions/debug/runpayload_debug.log
+    #for i in "${payloadarray[@]}"; do
+    #    echo "  $i" >> /root/udisk/extensions/debug/runpayload_debug.log
+    #done
+
+
     LED R
     sleep 3
     while [ $payloadcount -ge $PAYLOAD ]; do
        LED R
        GET SWITCH_POSITION
        TEST=$SWITCH_POSITION
+
+       #echo "Current switch position: $TEST" >> /root/udisk/extensions/debug/runpayload_debug.log
+
        LED B
        sleep 2
        GET SWITCH_POSITION
+
+       #echo "New switch position: $SWITCH_POSITION" >> /root/udisk/extensions/debug/runpayload_debug.log
+
        if [ $SWITCH_POSITION == $TEST ]; then
            LED G
-           "${payloadarray[0]}""${payloadarray["$PAYLOAD"]}"
+
+           FULL_PATH="${payloadarray[0]}${payloadarray[$PAYLOAD]}"
+           #echo "Full path to execute: $FULL_PATH" >> /root/udisk/extensions/debug/runpayload_debug.log
+           #echo "Checking if file exists: $(ls -la $FULL_PATH)" >> /root/udisk/extensions/debug/runpayload_debug.log
+           #echo "Attempting to execute payload..." >> /root/udisk/extensions/debug/runpayload_debug.log
+           sed -i 's/\r$//' "$FULL_PATH"
+           . "$FULL_PATH" #2>> /root/udisk/extensions/debug/runpayload_debug.log
+           #echo "Payload execution result: $?" >> /root/udisk/extensions/debug/runpayload_debug.log
+
            return
        fi
        LED G FAST