fix: tarball extracted in current directory (#1752)

thijskh · tvdijen · web-flow · commit c3d2b6ffb612 · 2023-01-31T13:12:57.000+01:00
* fix: tarball extracted in current directory

* Cleanup composer-file

---------

Co-authored-by: Tim van Dijen &lt;tvdijen@gmail.com&gt;
diff --git a/bin/build-release.sh b/bin/build-release.sh
@@ -24,7 +24,7 @@ COMPOSER="/tmp/composer.phar"
 cd /tmp
 
 if [ -a "$TARGET" ]; then
-    echo "$0: Destination already exists: $TARGET" >&2
+    echo "$0: Destination already exists: /tmp/$TARGET" >&2
     exit 1
 fi
 
@@ -43,6 +43,10 @@ php "$COMPOSER" config version "v$VERSION"
 # Install dependencies (without vcs history or dev tools)
 php "$COMPOSER" install --no-dev --prefer-dist -o
 
-php "$COMPOSER" archive -f tar.gz --dir /tmp --file "$TARGET"
+cd ..
+for f in `grep export-ignore "$TARGET/.gitattributes"|cut -d ' ' -f 1`; do
+    rm -r "$TARGET/$f"
+done
+tar --owner 0 --group 0 -cvzf "/tmp/$TARGET.tar.gz" "$TARGET"
 rm "$COMPOSER"
 echo `sha256sum /tmp/$TARGET.tar.gz`
diff --git a/composer.json b/composer.json
@@ -109,25 +109,5 @@
             "simplesamlphp/composer-module-installer": true,
             "muglug/package-versions-56": true
         }
-    },
-    "archive": {
-        "exclude": [
-            ".editorconfig",
-            ".gitattributes",
-            ".gitignore",
-            ".markdownlintignore",
-            ".markdownlintrc",
-            ".php_cs.dist",
-            "bin/build-release.sh",
-            "cert/.gitkeep",
-            "codecov.yml",
-            "node_modules",
-            "phpcs.xml",
-            "phpunit.xml",
-            "phpunit-interoperability.xml",
-            "psalm.xml",
-            "public/assets/.gitkeep",
-            "tests"
-        ]
     }
 }
