diff --git a/compile-ios.sh b/compile-ios.sh
index 3f4eee9f8c85fcf91dbb8e948251c1ad827fbfc3..41258505969004c229212af9f516d34b1e080548 100755
--- a/compile-ios.sh
+++ b/compile-ios.sh
@@ -63,11 +63,21 @@ CC="xcrun -sdk $SDK clang"
 CXX="xcrun -sdk $SDK clang++"
 
 IOS_TOP_DIR="$(pwd)"
-DAEMON_DIR="$(pwd)/../daemon"
-cd $DAEMON_DIR
 
-# TEMPORARY (until everything is merged)
-git fetch https://gerrit-ring.savoirfairelinux.com/ring-daemon refs/changes/38/4438/5 && git checkout FETCH_HEAD
+if [ -z "$DAEMON_DIR" ]; then
+    DAEMON_DIR="$(pwd)/../daemon"
+    echo "DAEMON_DIR not provided trying to find it in $DAEMON_DIR"
+fi
+if [ ! -d "$DAEMON_DIR" ]; then
+    echo 'Daemon not found.'
+    echo 'If you cloned the daemon in a custom location override' \
+            'DAEMON_DIR to point to it'
+    echo "You can also use our meta repo which contains both:
+          https://gerrit-ring.savoirfairelinux.com/#/admin/projects/ring-project"
+    exit 1
+fi
+
+cd $DAEMON_DIR
 
 for ARCH in "${ARCHS[@]}"
 do
@@ -76,7 +86,7 @@ do
 
     if test -z "$HOST"
     then
-        if $ARCH eq "arm64"
+        if [ "$ARCH" = "arm64" ]
         then
             HOST=aarch64-apple-darwin_ios
         else