Ran vendoring scripts through ShellCheck and removed bashisms to make the code more...

diff --git a/amneziawg-go/mkvendor.sh b/amneziawg-go/mkvendor.sh
index c1b372e35dab21cf616474c3bd7d3b9968a3e41c..5df5d1e6af73af94b3eb92c599c71d046685fc34 100644 (file)
--- a/amneziawg-go/mkvendor.sh
+++ b/amneziawg-go/mkvendor.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
 CWD="$(pwd)"
 TMP="${TMP:-$(mktemp -d)}"
-source "$CWD/amneziawg-go.info"
+. "$CWD/amneziawg-go.info"
 OUTPUT="${OUTPUT:-$CWD}"
 export GOPATH="$TMP/cache"
 export GOCACHE="$TMP/cache"

diff --git a/buf/mkvendor.sh b/buf/mkvendor.sh
index 4006245576ee489cd38c9db6e67ec108125a1d75..50b3402d6170c7c907782ec4f704555de33e22e7 100644 (file)
--- a/buf/mkvendor.sh
+++ b/buf/mkvendor.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
 CWD="$(pwd)"
 TMP="${TMP:-$(mktemp -d)}"
-source "$CWD/buf.info"
+. "$CWD/buf.info"
 OUTPUT="${OUTPUT:-$CWD}"
 export GOPATH="$TMP/cache"
 export GOCACHE="$TMP/cache"

diff --git a/dart-sass/mkvendor.sh b/dart-sass/mkvendor.sh
index 4eb96e21a963999133d95568838d85c0517895fc..cdc0260829fb2813a8c338c3e4ac41a903bd8688 100644 (file)
--- a/dart-sass/mkvendor.sh
+++ b/dart-sass/mkvendor.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
 CWD="$(pwd)"
 TMP="${TMP:-$(mktemp -d)}"
-source "$CWD/dart-sass.info"
+. "$CWD/dart-sass.info"
 OUTPUT="${OUTPUT:-$CWD}"
 export PUB_CACHE="$TMP/vendor/pub-cache"
 

diff --git a/element-desktop/mkvendor.sh b/element-desktop/mkvendor.sh
index b13e2678bfa342178510d85952fa7c701eada924..b8bfdcc080e351675de0eba1e7d8a8a0368404d8 100644 (file)
--- a/element-desktop/mkvendor.sh
+++ b/element-desktop/mkvendor.sh
@@ -1,15 +1,15 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
-if [ ! -x "$(which jq)" -o ! -x "$(which 7z)" ]; then
+if [ ! -x "$(which jq)" ] || [ ! -x "$(which 7z)" ]; then
   echo Please install jq and p7zip.
   exit 1
 fi
 
 CWD="$(pwd)"
 TMP="${TMP:-$(mktemp -d)}"
-source "$CWD/element-desktop.info"
+. "$CWD/element-desktop.info"
 OUTPUT="${OUTPUT:-$CWD}"
 
 export PATH="/opt/rust/bin:$PATH"
@@ -34,7 +34,7 @@ export CARGO_HOME="$BASE_TMP_DIR/cargo"
 mkdir -p "$YARN_YARN_OFFLINE_MIRROR"
 
 # element-web
-cd element-web-$VERSION
+cd "element-web-$VERSION"
 yarn install --frozen-lockfile \
              --ignore-engines \
              --no-fund \
@@ -42,15 +42,15 @@ yarn install --frozen-lockfile \
 yarn cache clean
 
 # element-desktop
-cd ../element-desktop-$VERSION
+cd "../element-desktop-$VERSION"
 
 ## pre-built electron
 EVERSION=$(jq --raw-output '.devDependencies.electron' < package.json)
-mkdir -p "$XDG_CACHE_HOME"/electron{,-builder}
+mkdir -p "$XDG_CACHE_HOME/electron" "$XDG_CACHE_HOME/electron-builder"
 if [ -e "$CWD/electron-v$EVERSION-linux-x64.zip" ]; then
   cp "$CWD/electron-v$EVERSION-linux-x64.zip" "$XDG_CACHE_HOME/electron/"
 else
-  wget --directory-prefix="$XDG_CACHE_HOME/electron" --tries=0 --retry-on-http-error=503 https://github.com/electron/electron/releases/download/v$EVERSION/electron-v$EVERSION-linux-x64.zip
+  wget --directory-prefix="$XDG_CACHE_HOME/electron" --tries=0 --retry-on-http-error=503 "https://github.com/electron/electron/releases/download/v$EVERSION/electron-v$EVERSION-linux-x64.zip"
 fi
 
 ## element-desktop itself
@@ -59,9 +59,9 @@ yarn install --frozen-lockfile \
              --no-fund \
              --update-checksums
 yarn cache clean
-EDIR="$(find $XDG_CACHE_HOME/electron -type d -mindepth 1 -maxdepth 1)"
+EDIR="$(find "$XDG_CACHE_HOME/electron" -type d -mindepth 1 -maxdepth 1)"
 rm "$EDIR/electron-v$EVERSION-linux-x64.zip"
-ln -s ../electron-v$EVERSION-linux-x64.zip "$EDIR/"
+ln -s "../electron-v$EVERSION-linux-x64.zip" "$EDIR/"
 
 ## pre-built ruby for electron-builder
 FPM_RUBY=$(grep linux-amd64 node_modules/app-builder-lib/out/targets/tools.js | head -1 | cut -d'"' -f2)
@@ -70,7 +70,7 @@ mkdir -p "$XDG_CACHE_HOME/electron-builder/$FPM_RUBY_TAG/$FPM_RUBY_TAG-${FPM_RUB
 if [ -e "$CWD/$FPM_RUBY" ]; then
   cp "$CWD/$FPM_RUBY" "$XDG_CACHE_HOME/electron-builder/"
 else
-  wget --directory-prefix="$XDG_CACHE_HOME/electron-builder/" --tries=0 --retry-on-http-error=503 https://github.com/electron-userland/electron-builder-binaries/releases/download/$FPM_RUBY_TAG/$FPM_RUBY
+  wget --directory-prefix="$XDG_CACHE_HOME/electron-builder/" --tries=0 --retry-on-http-error=503 "https://github.com/electron-userland/electron-builder-binaries/releases/download/$FPM_RUBY_TAG/$FPM_RUBY"
 fi
 7z x -o"$XDG_CACHE_HOME/electron-builder/$FPM_RUBY_TAG/$FPM_RUBY_TAG-${FPM_RUBY%.7z}" "$XDG_CACHE_HOME/electron-builder/$FPM_RUBY"
 rm "$XDG_CACHE_HOME/electron-builder/$FPM_RUBY"
@@ -78,18 +78,18 @@ rm "$XDG_CACHE_HOME/electron-builder/$FPM_RUBY"
 ## matrix-seshat
 RUST_PLATFORM=$(rustc -Vv | awk '/host/ {print $2}')
 SESHATVERSION=$(jq --raw-output '.hakDependencies."matrix-seshat"' < package.json | tr -d '^')
-mkdir -p .hak/hakModules .hak/matrix-seshat/$RUST_PLATFORM
+mkdir -p .hak/hakModules ".hak/matrix-seshat/$RUST_PLATFORM"
 if [ -e "$CWD/seshat-$SESHATVERSION.tar.gz" ]; then
   cp "$CWD/seshat-$SESHATVERSION.tar.gz" .hak/
 else
-  wget --directory-prefix=.hak --tries=0 --retry-on-http-error=503 https://github.com/matrix-org/seshat/archive/$SESHATVERSION/seshat-$SESHATVERSION.tar.gz
+  wget --directory-prefix=.hak --tries=0 --retry-on-http-error=503 "https://github.com/matrix-org/seshat/archive/$SESHATVERSION/seshat-$SESHATVERSION.tar.gz"
 fi
-tar xf .hak/seshat-$SESHATVERSION.tar.gz -C .hak seshat-$SESHATVERSION/seshat-node
-mv .hak/seshat-$SESHATVERSION/seshat-node .hak/hakModules/matrix-seshat
-ln -s ../../hakModules/matrix-seshat .hak/matrix-seshat/$RUST_PLATFORM/build
-rm -r .hak/seshat-$SESHATVERSION.tar.gz .hak/seshat-$SESHATVERSION
+tar xf ".hak/seshat-$SESHATVERSION.tar.gz" -C .hak "seshat-$SESHATVERSION/seshat-node"
+mv ".hak/seshat-$SESHATVERSION/seshat-node" .hak/hakModules/matrix-seshat
+ln -s ../../hakModules/matrix-seshat ".hak/matrix-seshat/$RUST_PLATFORM/build"
+rm -r ".hak/seshat-$SESHATVERSION.tar.gz" ".hak/seshat-$SESHATVERSION"
 
-cd .hak/matrix-seshat/$RUST_PLATFORM/build
+cd ".hak/matrix-seshat/$RUST_PLATFORM/build"
 yarn install --frozen-lockfile \
              --ignore-engines \
              --no-fund \
@@ -120,8 +120,8 @@ 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
-cd $CWD
+           "element-desktop-$VERSION/vendor" \
+           "element-desktop-$VERSION/.hak" \
+           "element-desktop-$VERSION/electron-cache"
+rm -rf "$TMP"
+cd "$CWD"

diff --git a/helix/mkvendor.sh b/helix/mkvendor.sh
index 1ed2ad986a50418551a52618486e9f36d3a2ba13..ce3b52456dc28ebf7478b1febdd2c3711307bb39 100644 (file)
--- a/helix/mkvendor.sh
+++ b/helix/mkvendor.sh
@@ -4,9 +4,9 @@ set -e
 
 CWD=$(pwd)
 TMP=$(mktemp -d)
-source $CWD/helix.info
-OUTPUT=${OUTPUT:-$CWD}
-export CARGO_HOME=$TMP
+. "$CWD/helix.info"
+OUTPUT="${OUTPUT:-$CWD}"
+export CARGO_HOME="$TMP"
 
 export PATH="/opt/rust/bin:$PATH"
 if [ -z "$LD_LIBRARY_PATH" ]; then
@@ -15,9 +15,9 @@ else
   export LD_LIBRARY_PATH="/opt/rust/lib64:$LD_LIBRARY_PATH"
 fi
 
-mkdir -p $TMP/$PRGNAM-$VERSION
-tar xf $CWD/$PRGNAM-$VERSION-source.tar.xz -C $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+mkdir -p "$TMP/$PRGNAM-$VERSION"
+tar xf "$CWD/$PRGNAM-$VERSION-source.tar.xz" -C "$TMP/$PRGNAM-$VERSION"
+cd "$TMP/$PRGNAM-$VERSION"
 
 # configure cargo-vendor-filterer
 # the [package] definition and existing src/main.rs file are required for vendoring to work
@@ -45,7 +45,7 @@ replace-with = "vendored-sources"
 directory = "vendor"
 EOF
 
-tar cfJ $OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz .cargo/ vendor/
+tar cfJ "$OUTPUT/$PRGNAM-$VERSION-vendored-sources.tar.xz" .cargo/ vendor/
 
-cd $CWD
-rm -rf $TMP
+cd "$CWD"
+rm -rf "$TMP"

diff --git a/popcorntime/mkvendor.sh b/popcorntime/mkvendor.sh
index e6f3317560f7cfb3fc049cd6a0e5a2cf6d13c3cc..f55d2e850d22a3f84bb1e31a385a4b9a6462b56d 100644 (file)
--- a/popcorntime/mkvendor.sh
+++ b/popcorntime/mkvendor.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
 CWD="$(pwd)"
 TMP="${TMP:-$(mktemp -d)}"
-source "$CWD/popcorntime.info"
+. "$CWD/popcorntime.info"
 TARNAM=popcorn-desktop
 OUTPUT="${OUTPUT:-$CWD}"
 export YARN_CACHE_FOLDER="$TMP/cache"

diff --git a/shadowsocks-rust/mkvendor.sh b/shadowsocks-rust/mkvendor.sh
index c3ca2d71c0baa8fb491b084de5e303710119db05..7abced7d09c790747b8eec093b2961ed3d181bd7 100644 (file)
--- a/shadowsocks-rust/mkvendor.sh
+++ b/shadowsocks-rust/mkvendor.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
 CWD="$(pwd)"
 TMP="${TMP:-$(mktemp -d)}"
-source "$CWD/shadowsocks-rust.info"
+. "$CWD/shadowsocks-rust.info"
 OUTPUT="${OUTPUT:-$CWD}"
 export CARGO_HOME="$TMP"