Comment out everything else and just echo the initial environment var…

.github/workflows/android-automated-sdk-install.sh → .github/workflows/android-automated-sdk-install.yml

@@ -34,41 +34,49 @@ jobs:
         echo "SDK root before install $ANDROID_SDK_ROOT"
         cat $ANDROID_SDK_ROOT/cmdline-tools/latest/source.properties
         echo "Existing installed packages"
-        $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --list-installed
+        $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --list_installed
 
     - name: Install to a new SDK root
       run: |
         export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
         echo "New SDK root $ANDROID_SDK_ROOT"
-        yes Y | setup/prereq_android_sdk_install.sh
+        printf "Y\nY\nY\nY\nY\n" | bash setup/prereq_android_sdk_install.sh
 
     - name: Verify that all packages are as expected
       shell: bash -l {0}
       run: |
         echo "Comparing $ANDROID_SDK_ROOT and $NEW_ANDROID_SDK_ROOT"
         $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --list_installed > /tmp/existing_packages
         $NEW_ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --list_installed > /tmp/new_packages
-        diff /tmp/existing_packages /tmp/new_packages
+        diff -uw /tmp/existing_packages /tmp/new_packages
+        echo "Expected differences; emulators, SDK versions, tool versions"
 
     - name: Verify that directory structure is consistent
-      shell: bash -l {0}
+      shell: bash -l -x {0}
       run: |
         export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
         echo "New SDK root $ANDROID_SDK_ROOT"
         ls -al $ANDROID_SDK_ROOT
-        if [ ! -f $ANDROID_SDK_ROOT/emulator ]; then exit 1 fi
-        if [ ! -f $ANDROID_SDK_ROOT/build-tools ]; then exit 1 fi
-        if [ ! -f $ANDROID_SDK_ROOT/patcher ]; then exit 1 fi
-        if [ ! -f $ANDROID_SDK_ROOT/extras ]; then exit 1 fi
-        if [ ! -f $ANDROID_SDK_ROOT/platforms ]; then exit 1 fi
-        if [ ! -f $ANDROID_SDK_ROOT/platform-tools ]; then exit 1 fi
-        if [ ! -f $ANDROID_SDK_ROOT/system-images ]; then exit 1 fi
+        if [ ! -d $ANDROID_SDK_ROOT/emulator ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/build-tools ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/patcher ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/extras ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/platforms ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/platform-tools ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/system-images ]; then exit 1; fi
 
     - name: Ensure that the path is correct and installed programs are runnable
       shell: bash -l {0}
       run: |
         export JAVA_HOME=$JAVA_HOME_11_X64
         export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
         echo "New SDK root $ANDROID_SDK_ROOT"
-        source setup/activate_native.sh
         $ANDROID_SDK_ROOT/emulator/emulator -list-avds
+
+    - name: Ensure that the path is correct and the project can be activated
+      shell: bash -l {0}
+      run: |
+        export JAVA_HOME=$JAVA_HOME_11_X64
+        export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
+        echo "New SDK root $ANDROID_SDK_ROOT"
+        source setup/activate_native.sh

setup/prereq_android_sdk_install.sh

@@ -32,7 +32,9 @@ echo "Downloading the android SDK. This will take a LONG time and will require y
 read -p "Do you wish to continue? (Y/N)" CONTINUE
 if [ $CONTINUE == "Y" ];
 then
+    echo "BEGIN: About to start android SDK download"
     $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --package_file=setup/android_sdk_packages
+    echo "END: Done with android SDK download, exiting script"
 else
     echo "Please install this before proceeding with the installation steps"
     exit 1