Fix vendoring scripts

diff --git a/amneziawg-go/mkvendor.sh b/amneziawg-go/mkvendor.sh
index 5df5d1e6af73af94b3eb92c599c71d046685fc34..ece3b4ca534684f110362f881b6fae105a53233c 100644 (file)
--- 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 50b3402d6170c7c907782ec4f704555de33e22e7..fc0be6ee3b85a51353d585de6e4f40e98a9ab80e 100644 (file)
--- 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 cdc0260829fb2813a8c338c3e4ac41a903bd8688..cc5f9bbf1ed7d18a6ad364dbf43d98004c85ad16 100644 (file)
--- 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 b8bfdcc080e351675de0eba1e7d8a8a0368404d8..a24ec13a53e605ae6459a376b03762dfa19b488e 100644 (file)
--- 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 ce3b52456dc28ebf7478b1febdd2c3711307bb39..f231770fd61981ba1a987f9eb360ca9a4a15ae31 100644 (file)
--- 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 f55d2e850d22a3f84bb1e31a385a4b9a6462b56d..6a66f5273b380a175000b5f97c51c992f88dc788 100644 (file)
--- 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 7abced7d09c790747b8eec093b2961ed3d181bd7..c2663853e440b8a4d5ec4c10762f354cb3eb8377 100644 (file)
--- 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/