Fixes #5 Fix Emulator Not Found Error

upmc-enterprises · Feb 25, 2020 · 6368ca9 · 6368ca9
1 parent 9393f17
commit 6368ca9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/setup-emulator.sh b/setup-emulator.sh
@@ -4,10 +4,14 @@ currentDirController="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 &
 source "$currentDirController/config.sh"
 source "$installDestination/paths.sh"
 
-alreadyHasAvd=$($installDestination/emulator/emulator -list-avds | grep -o "$emulatorDeviceName")
-
 # Don't bother setting up the AVD again, if already done
-if [[ "$alreadyHasAvd" == "" ]]; then
+if [ -x "$(command -v $installDestination/emulator/emulator)" ]; then
+  alreadyHasAvd=$($installDestination/emulator/emulator -list-avds | grep -o "$emulatorDeviceName")
+
+  if [[ "$alreadyHasAvd" == "" ]]; then
+    source "$currentDirController/emulator/create-avd.sh"
+  fi
+else
   source "$currentDirController/emulator/create-avd.sh"
 fi