Merge remote-tracking branch 'alexfmpe/fix-ios-simulator' into ios-fi…

…xes-for-19-09 Fixes #527
reflex-frp · Dec 2, 2019 · cb81498 · cb81498
2 parents 707408b + e6a9607
commit cb81498
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ios/default.nix b/ios/default.nix
@@ -273,10 +273,7 @@ nixpkgs.runCommand "${executableName}-app" (rec {
     cp -LR "$(dirname $0)/../${executableName}.app" $tmpdir
     chmod +w "$tmpdir/${executableName}.app"
     mkdir -p "$tmpdir/${executableName}.app/config"
-    cp "$1" "$tmpdir/${executableName}.app/config/route"
-
-    # focus????
-    focus/reflex-platform/scripts/run-in-ios-sim "$tmpdir/${executableName}.app"
+    (cd "$(dirname $0)/../../scripts" && ./run-in-ios-sim "$tmpdir/${executableName}.app")
   '';
 }) ''
   set -x

diff --git a/scripts/run-todomvc-in-ios-sim.sh b/scripts/run-todomvc-in-ios-sim.sh
@@ -2,7 +2,8 @@
 set -euo pipefail
 
 function cleanup {
-  if [ -n "$uuid" ]; then
+  # alternative to [ -v ] for bash prior to 4.2
+  if [ -n "${uuid-}" ]; then
     echo "Cleaning up simulator" >&2
     xcrun simctl shutdown $uuid 2>/dev/null
     xcrun simctl delete $uuid