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

---
 .../draft-release-automatic-trigger.yml       |  2 +-
 scripts/package-release-assets.sh             | 36 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/draft-release-automatic-trigger.yml b/.github/workflows/draft-release-automatic-trigger.yml
index 66cdc3d..9f341cb 100644
--- a/.github/workflows/draft-release-automatic-trigger.yml
+++ b/.github/workflows/draft-release-automatic-trigger.yml
@@ -34,4 +34,4 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           draft: true
-          files: release/ouch-*
+          files: assets/ouch-*
diff --git a/scripts/package-release-assets.sh b/scripts/package-release-assets.sh
index 1d3c671..a860328 100755
--- a/scripts/package-release-assets.sh
+++ b/scripts/package-release-assets.sh
@@ -1,28 +1,28 @@
 #!/usr/bin/env bash
-
 set -e
 
-mkdir release
 cd downloaded_artifacts
+mkdir ../assets
 
-for dir in ouch-*; do
-    mkdir "$dir/man"
-    mv "$dir"/artifacts/*.1 "$dir/man"
+for input_dir in ouch-*; do
+    cp ../{README.md,LICENSE,CHANGELOG.md} "$input_dir"
+    mkdir "$input_dir/man"
+    mkdir "$input_dir/artifacts"
 
-    mv "$dir/artifacts" "$dir/completions"
+    mv "$input_dir"/artifacts/*.1 "$input_dir/man"
+    mv "$input_dir"/artifacts/* "$input_dir/completions"
+    rm -r "$input_dir/artifacts"
 
-    cp ../{README.md,LICENSE,CHANGELOG.md} "$dir"
-
-    if [[ "$dir" = *.exe ]]; then
-        target=${dir%.exe}
-        mv "$dir/target/${target/ouch-/}/release/ouch.exe" "$dir"
-        rm -r "$dir/target"
-        mv "$dir" "$target"
-        zip -r "../release/$target.zip" "$target"
+    if [[ "$input_dir" = *.exe ]]; then
+        target=${input_dir%.exe}
+        mv "$input_dir/target/${target/ouch-/}/release/ouch.exe" "$input_dir"
+        rm -r "$input_dir/target"
+        mv "$input_dir" "$target"
+        zip -r "../assets/$target.zip" "$target"
     else
-        mv "$dir/target/${dir/ouch-/}/release/ouch" "$dir"
-        rm -r "$dir/target"
-        chmod +x "$dir/ouch"
-        tar czf "../release/$dir.tar.gz" "$dir"
+        mv "$input_dir/target/${input_dir/ouch-/}/release/ouch" "$input_dir"
+        rm -r "$input_dir/target"
+        chmod +x "$input_dir/ouch"
+        tar czf "../assets/$input_dir.tar.gz" "$input_dir"
     fi
 done