From fb02f1b0b597e41829698c1e8f132b2bccebc9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Marcos?= <marcospb19@hotmail.com>
Date: Sun, 6 Apr 2025 19:20:58 -0300
Subject: [PATCH] wip

---
 .github/workflows/build-artifacts-and-run-tests.yml | 4 ++--
 scripts/package-release-assets.sh                   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 scripts/package-release-assets.sh

diff --git a/.github/workflows/build-artifacts-and-run-tests.yml b/.github/workflows/build-artifacts-and-run-tests.yml
index 685a427..26f8824 100644
--- a/.github/workflows/build-artifacts-and-run-tests.yml
+++ b/.github/workflows/build-artifacts-and-run-tests.yml
@@ -105,7 +105,7 @@ jobs:
           if [[ "${{ matrix.feature-use-zlib }}" == true ]]; then FEATURES+=(use_zlib); fi
           if [[ "${{ matrix.feature-use-zstd-thin }}" == true ]]; then FEATURES+=(use_zstd_thin); fi
           if [[ "${{ matrix.feature-unrar }}" == true ]]; then FEATURES+=(unrar); fi
-          IFS=','
+          IFS='+'
           echo "FEATURES=${FEATURES[*]}" >> $GITHUB_OUTPUT
 
       - name: Set up extra cargo flags
@@ -145,7 +145,7 @@ jobs:
               (matrix.feature-unrar && matrix.feature-use-zlib && matrix.feature-use-zstd-thin)) }}
         uses: actions/upload-artifact@v4
         with:
-          name: ouch-${{ matrix.target }}-${{ steps.concat-features.outputs.FEATURES }}
+          name: ouch-${{ matrix.target }}${{ steps.concat-features.outputs.FEATURES != '' && format('-{0}', steps.concat-features.outputs.FEATURES) || '' }}
           path: |
             target/${{ matrix.target }}/release/ouch
             target/${{ matrix.target }}/release/ouch.exe
diff --git a/scripts/package-release-assets.sh b/scripts/package-release-assets.sh
old mode 100644
new mode 100755
index 0b45e06..1d3c671
--- a/scripts/package-release-assets.sh
+++ b/scripts/package-release-assets.sh
@@ -6,12 +6,12 @@ mkdir release
 cd downloaded_artifacts
 
 for dir in ouch-*; do
-    cp -r "$dir/artifacts" "$dir/completions"
     mkdir "$dir/man"
-    mv "$dir"/completions/*.1 "$dir/man"
+    mv "$dir"/artifacts/*.1 "$dir/man"
 
-    cp ../{README.md,LICENSE,CHANGELOG.md} "$fulldir"
-    rm -r "$fulldir/artifacts"
+    mv "$dir/artifacts" "$dir/completions"
+
+    cp ../{README.md,LICENSE,CHANGELOG.md} "$dir"
 
     if [[ "$dir" = *.exe ]]; then
         target=${dir%.exe}