From 318b7cf05f5b9a59b344427506d6656067e68002 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Tue, 20 Feb 2018 13:35:49 +0100 Subject: [PATCH] +fix 'web' spy now composer-update+npm-build at start --- metactl/ci/web.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/metactl/ci/web.sh b/metactl/ci/web.sh index cd399e1..43f95f7 100644 --- a/metactl/ci/web.sh +++ b/metactl/ci/web.sh @@ -15,13 +15,6 @@ TRIGGER="`realpath $ROOT/../../virtual/ci/web`"; while true; do - - while [ -f $TRIGGER ]; do - - sleep 1; - - done; - # 1. Go to root directory cd $ROOT/../..; @@ -29,7 +22,7 @@ while true; do git submodule update --remote; # 3. Update composer - docker exec php-fpm composer -d /vhost; + docker exec php-fpm composer update -d /vhost; # 4. Re-build js/scss docker exec php-fpm npm run build --prefix /vhost; @@ -39,6 +32,9 @@ while true; do # N. Recreate trigger test ! -f $TRIGGER && touch $TRIGGER; - sleep 1; + + while [ -f $TRIGGER ]; do + sleep 1; + done; done; \ No newline at end of file