STASH Script fixed for macOS - TODO testing on Unix and Windows

Author: PhilLab

scripts/androidScreenshotTest

@@ -40,9 +40,20 @@ if [ $# -lt 2 ]; then
     exit
 fi
 
+# Detect portable sed -i usage (GNU sed supports -i, BSD/macOS sed requires -i '')
+if sed --version >/dev/null 2>&1 ; then
+    SED_INPLACE=(-i)
+else
+    SED_INPLACE=(-i '')
+fi
+
 pushd app/src/androidTest/java
 
-class=$(find | grep $2 | grep -E "java$|kt$" | head -n1|sed s'/\//\./'g | sed s'#^\.\.##' | sed s'#\.java##'| sed s'#\.kt##')
+# Use explicit path for find for macOS/BSD compatibility and get the first matching java/kt file
+class_file=$(find . -type f \( -name "*.java" -o -name "*.kt" \) -print 2>/dev/null | grep "$2" | grep -E "java$|kt$" | head -n1)
+
+# convert found path to FQCN (remove leading ./, convert / to . and strip extension)
+class=$(echo "$class_file" | sed 's#^\./##' | sed 's#/#.#g' | sed 's#\.java##'| sed 's#\.kt##')
 
 if [[ -z $class ]]; then
     echo "Class not found!"
@@ -62,8 +73,8 @@ if [ -e $3 ] ; then
 else
     method="#$3"
 
-    # check if method exists
-    if [[ $(grep -c $3 $(find | grep $2 | grep -E "java$|kt$" | head -n1)) -eq 0 ]]; then
+    # check if method exists in the previously found file
+    if [[ $(grep -c "$3" "$class_file") -eq 0 ]]; then
         echo "Method not found!"
         exit 1
     fi
@@ -76,7 +87,7 @@ else
 fi
 
 popd
-sed -i s'#<bool name="is_beta">false</bool>#<bool name="is_beta">true</bool>#'g app/src/main/res/values/setup.xml
+sed "${SED_INPLACE[@]}" s'#<bool name="is_beta">false</bool>#<bool name="is_beta">true</bool>#'g app/src/main/res/values/setup.xml
 
 # check if emulator is running
 emulatorIsRunning=false
@@ -100,7 +111,7 @@ if [ "$emulatorIsRunning" == false ] ; then
     # If emulator of expected name doesn't exist, create it
     # TODO - this was copied from updateScreenshots.sh - move it to a common helper script
     if [[ $(emulator -list-avds | grep uiComparison -c) -eq 0 ]]; then
-        (sleep 5; echo "no") | avdmanager create avd -n uiComparison -c 100M -k "system-images;android-28;google_apis;x86" --abi "google_apis/x86"
+        (sleep 5; echo "no") | avdmanager create avd -n uiComparison -c 100M -k "system-images;android-28;google_apis;arm64-v8a" --abi "google_apis/arm64-v8a"
     fi
 
     "$(command -v emulator)" -writable-system -avd uiComparison -no-snapshot -gpu swiftshader_indirect -no-audio -skin 500x833 &
@@ -126,5 +137,5 @@ else
 fi
 
 
-sed -i s'#<bool name="is_beta">true</bool>#<bool name="is_beta">false</bool>#'g app/src/main/res/values/setup.xml
+sed "${SED_INPLACE[@]}" s'#<bool name="is_beta">true</bool>#<bool name="is_beta">false</bool>#'g app/src/main/res/values/setup.xml
 unset ANDROID_SERIAL