From 88a3548d7e9f351f22a5805de4796558881d94d6 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 31 Mar 2021 11:36:29 +0200
Subject: [PATCH] :sparkles: Use babashka to properly wait exporter
 compilation.

---
 docker/devenv/files/start-tmux.sh  |  2 ++
 exporter/scripts/wait-and-start.sh | 17 +++--------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/docker/devenv/files/start-tmux.sh b/docker/devenv/files/start-tmux.sh
index 2c81626ab..1770934fd 100755
--- a/docker/devenv/files/start-tmux.sh
+++ b/docker/devenv/files/start-tmux.sh
@@ -26,7 +26,9 @@ tmux send-keys -t penpot 'npx shadow-cljs watch main' enter
 tmux new-window -t penpot:2 -n 'exporter'
 tmux select-window -t penpot:2
 tmux send-keys -t penpot 'cd penpot/exporter' enter C-l
+tmux send-keys -t penpot 'rm -f target/app.js*' enter C-l
 tmux send-keys -t penpot 'npx shadow-cljs watch main' enter
+
 tmux split-window -v
 tmux send-keys -t penpot 'cd penpot/exporter' enter C-l
 tmux send-keys -t penpot './scripts/wait-and-start.sh' enter
diff --git a/exporter/scripts/wait-and-start.sh b/exporter/scripts/wait-and-start.sh
index 512bf4cf8..730ed16bc 100755
--- a/exporter/scripts/wait-and-start.sh
+++ b/exporter/scripts/wait-and-start.sh
@@ -1,16 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-
-wait_file() {
-  local file="$1"; shift
-  local wait_seconds="${1:-10}"; shift # 10 seconds as default timeout
-
-  until test $((wait_seconds--)) -eq 0 -o -f "$file" ; do sleep 1; done
-
-  ((++wait_seconds))
-}
-
-wait_file "target/app.js" 120 && {
-  node target/app.js
-}
+bb -i '(babashka.wait/wait-for-port "localhost" 9630)';
+bb -i '(babashka.wait/wait-for-path "target/app.js")';
+node target/app.js