From 2c6f9ca248b16cb7f4457b7392882915b311ebf5 Mon Sep 17 00:00:00 2001
From: fsLeg <fsleg@t-rg.ws>
Date: Sat, 30 Aug 2025 12:45:40 +0300
Subject: [PATCH] Fix vendoring scripts

---
 amneziawg-go/mkvendor.sh     |  7 ++++---
 buf/mkvendor.sh              |  7 ++++---
 dart-sass/mkvendor.sh        |  6 +++---
 element-desktop/mkvendor.sh  | 15 ++++++++++-----
 helix/mkvendor.sh            |  6 +++++-
 popcorntime/mkvendor.sh      |  4 ++--
 shadowsocks-rust/mkvendor.sh |  2 +-
 7 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/amneziawg-go/mkvendor.sh b/amneziawg-go/mkvendor.sh
index 5df5d1e..ece3b4c 100644
--- a/amneziawg-go/mkvendor.sh
+++ b/amneziawg-go/mkvendor.sh
@@ -14,11 +14,12 @@ cd "$TMP/$PRGNAM-$VERSION"
 
 go mod vendor
 
-if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar" ]; then
-    rm "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar"
+if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" ]; then
+    rm -v "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz"
 fi
 
 tar cfJ "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" vendor/
 
+go clean -cache -modcache
 cd "$CWD"
-su -c "rm -rf \"$TMP\""
+rm -rv "$TMP"
diff --git a/buf/mkvendor.sh b/buf/mkvendor.sh
index 50b3402..fc0be6e 100644
--- a/buf/mkvendor.sh
+++ b/buf/mkvendor.sh
@@ -14,11 +14,12 @@ cd "$TMP/$PRGNAM-$VERSION"
 
 go mod vendor
 
-if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar" ]; then
-    rm "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar"
+if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" ]; then
+    rm -v "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz"
 fi
 
 tar cfJ "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" vendor/
 
+go clean -cache -modcache
 cd "$CWD"
-su -c "rm -rf \"$TMP\""
+rm -rv "$TMP"
diff --git a/dart-sass/mkvendor.sh b/dart-sass/mkvendor.sh
index cdc0260..cc5f9bb 100644
--- a/dart-sass/mkvendor.sh
+++ b/dart-sass/mkvendor.sh
@@ -14,11 +14,11 @@ cd "$TMP/$PRGNAM-$VERSION"
 dart --disable-analytics
 dart pub get
 
-if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar" ]; then
-    rm "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar"
+if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" ]; then
+    rm -v "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz"
 fi
 
 tar cfJ "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" -C "$TMP" vendor/
 
 cd "$CWD"
-rm -rf "$TMP"
+rm -rv "$TMP"
diff --git a/element-desktop/mkvendor.sh b/element-desktop/mkvendor.sh
index b8bfdcc..a24ec13 100644
--- a/element-desktop/mkvendor.sh
+++ b/element-desktop/mkvendor.sh
@@ -119,9 +119,14 @@ cd ../../../..
 
 # vendor everything
 cd ..
-tar cfJ "$OUTPUT/element-desktop-$VERSION-vendored-sources.tar.xz" \
-           "element-desktop-$VERSION/vendor" \
-           "element-desktop-$VERSION/.hak" \
-           "element-desktop-$VERSION/electron-cache"
-rm -rf "$TMP"
+
+if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" ]; then
+    rm -v "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz"
+fi
+
+tar cfJ "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" \
+        "$PRGNAM-$VERSION/vendor" \
+        "$PRGNAM-$VERSION/.hak" \
+        "$PRGNAM-$VERSION/electron-cache"
 cd "$CWD"
+rm -rv "$TMP"
diff --git a/helix/mkvendor.sh b/helix/mkvendor.sh
index ce3b524..f231770 100644
--- a/helix/mkvendor.sh
+++ b/helix/mkvendor.sh
@@ -45,7 +45,11 @@ replace-with = "vendored-sources"
 directory = "vendor"
 EOF
 
+if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" ]; then
+    rm -v "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz"
+fi
+
 tar cfJ "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" .cargo/ vendor/
 
 cd "$CWD"
-rm -rf "$TMP"
+rm -rv "$TMP"
diff --git a/popcorntime/mkvendor.sh b/popcorntime/mkvendor.sh
index f55d2e8..6a66f52 100644
--- a/popcorntime/mkvendor.sh
+++ b/popcorntime/mkvendor.sh
@@ -50,10 +50,10 @@ yarn install --frozen-lockfile \
              --production
 
 if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar" ]; then
-    rm "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar"
+    rm -v "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar"
 fi
 
 tar cf "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar" -C "$TMP" vendor/
 
 cd "$CWD"
-rm -rf "$TMP"
+rm -rv "$TMP"
diff --git a/shadowsocks-rust/mkvendor.sh b/shadowsocks-rust/mkvendor.sh
index 7abced7..c266385 100644
--- a/shadowsocks-rust/mkvendor.sh
+++ b/shadowsocks-rust/mkvendor.sh
@@ -40,7 +40,7 @@ directory = "vendor"
 EOF
 
 if [ -f "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" ]; then
-    rm "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz"
+    rm -v "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz"
 fi
 
 tar cfJ "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" .cargo/ vendor/
-- 
2.46.4