Merge pull request #61 from vbakke/feat/dev-composer

feat: Install deps always, also in bat file

Ah, I could merge my changes myself, though.

Author: vbakke

yaml-generation/generateDimensions.bash

@@ -6,26 +6,23 @@
 #    ./generateDimensions.bash --test-urls   Test URLs in implementations.yaml
 
 cd "$(dirname "$0")"/..
-pwd
 
 # Use: docker | podman
 if [ -z "${DOCKER_CMD}" ]; then
     DOCKER_CMD=docker
 fi
 
 echo Installing composer dependencies...
-MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume ${PWD}:/app wurstbrot/dsomm-yaml-generation bash -c 'cd /app/yaml-generation && composer install --no-interaction --no-plugins --no-scripts --prefer-dist'
+MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume "${PWD}:/app" wurstbrot/dsomm-yaml-generation bash -c 'cd /app/yaml-generation && composer install --no-interaction --no-plugins --no-scripts --prefer-dist'
 
 if [ "$1" = "--start-dsomm" ]; then
     echo "Starting local DSOMM application..."
-    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume $(pwd)/src/assets/YAML/generated/generated.yaml:/srv/assets/YAML/generated/generated.yaml -p 8080:8080 wurstbrot/dsomm
-
+    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume "${PWD}/src/assets/YAML/generated/generated.yaml:/srv/assets/YAML/generated/generated.yaml" -p 8080:8080 wurstbrot/dsomm
 elif [ "$1" = "--test-urls" ]; then
     echo "Test URLs in implementations.yaml..."
-    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -e TEST_REFERENCED_URLS=true -ti --rm --volume ${PWD}:/app wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php' | tee url-test-results.txt
+    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -e TEST_REFERENCED_URLS=true -ti --rm --volume "${PWD}:/app" wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php' | tee url-test-results.txt
 
 else
     echo "Generating activities.yaml..."
-    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume ${PWD}:/app wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php'
-
+    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume "${PWD}:/app" wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php'
 fi

yaml-generation/generateDimensions.bat

@@ -14,11 +14,10 @@ if "%DOCKER_CMD%"=="" (
     set DOCKER_CMD=docker
 )
 
-if "%~1"=="--install" (
-    echo Installing composer dependencies...
-    %DOCKER_CMD% run -ti --rm --volume "%CD%:/app" wurstbrot/dsomm-yaml-generation bash -c "cd /app/yaml-generation && composer install --no-interaction --no-plugins --no-scripts --prefer-dist"
+echo Installing composer dependencies...
+%DOCKER_CMD% run -ti --rm --volume "%CD%:/app" wurstbrot/dsomm-yaml-generation bash -c "cd /app/yaml-generation && composer install --no-interaction --no-plugins --no-scripts --prefer-dist"
 
-) else if "%~1"=="--start-dsomm" (
+if "%~1"=="--start-dsomm" (
     echo Start local DSOMM application...
     %DOCKER_CMD% run -ti --rm --volume "%CD%/src/assets/YAML/generated/generated.yaml:/srv/assets/YAML/generated/generated.yaml" -p 8080:8080 wurstbrot/dsomm