From 3e2701f136b3c95aebe5fd880e28c95586feb68e Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 17 Jan 2021 13:03:44 +0100 Subject: [PATCH] Updated how to copy mezzio helper script to dist file --- .dockerignore | 1 + .gitignore | 1 - {vendor/bin => bin/helper}/mezzio-swoole | 0 build.sh | 3 +++ 4 files changed, 4 insertions(+), 1 deletion(-) rename {vendor/bin => bin/helper}/mezzio-swoole (100%) diff --git a/.dockerignore b/.dockerignore index 2080adcf..f9102acb 100644 --- a/.dockerignore +++ b/.dockerignore @@ -21,3 +21,4 @@ infection* **/test* build* **/.* +bin/helper diff --git a/.gitignore b/.gitignore index bd42bc71..8cfea409 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ build composer.lock composer.phar vendor/ -!vendor/bin/mezzio-swoole data/database.sqlite data/shlink-tests.db data/GeoLite2-City.mmdb diff --git a/vendor/bin/mezzio-swoole b/bin/helper/mezzio-swoole similarity index 100% rename from vendor/bin/mezzio-swoole rename to bin/helper/mezzio-swoole diff --git a/build.sh b/build.sh index 2f5a23bd..16610a8b 100755 --- a/build.sh +++ b/build.sh @@ -28,6 +28,9 @@ echo "Installing dependencies with $composerBin..." ${composerBin} self-update ${composerBin} install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction +# Copy mezzio helper script to vendor (deprecated - Remove with Shlink 3.0.0) +cp "${projectdir}/bin/helper/mezzio-swoole" "./vendor/bin" + # Delete development files echo 'Deleting dev files...' rm composer.*