aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2020-04-14 12:04:55 +0000
committers-ol <s-ol@users.noreply.github.com>2020-04-14 12:04:55 +0000
commit43e535d28ce91e33669142e19309854e908b0ee3 (patch)
tree6793b918f5edfa9809a176b109cd4569171c81b3
parentadd rockspec (diff)
downloadalive-43e535d28ce91e33669142e19309854e908b0ee3.tar.gz
alive-43e535d28ce91e33669142e19309854e908b0ee3.zip
shellcheck sh scripts
-rwxr-xr-xbin/alv-copilot4
-rwxr-xr-xextra/git-version.sh6
-rwxr-xr-xrockspecs/gen-rockspec.sh15
3 files changed, 13 insertions, 12 deletions
diff --git a/bin/alv-copilot b/bin/alv-copilot
index 68e8ebd..9341655 100755
--- a/bin/alv-copilot
+++ b/bin/alv-copilot
@@ -4,10 +4,10 @@ set -e
tmpdir=$(mktemp -d)
trap 'rm -rf "$tmpdir"' EXIT INT TERM HUP
-ARGS="$@"
+ARGS=$*
FIFO=$tmpdir/fifo
CONF=$tmpdir/conf
-LIBDIR=$(dirname $0)
+LIBDIR=$(dirname "$0")
LUA_PATH="$LIBDIR/?.lua;$LIBDIR/?/init.lua;$LUA_PATH"
cat > "$CONF" << 'EOF'
diff --git a/extra/git-version.sh b/extra/git-version.sh
index 7712b09..495b679 100755
--- a/extra/git-version.sh
+++ b/extra/git-version.sh
@@ -1,8 +1,8 @@
#!/bin/sh
-TAG=`git describe --abbrev=0 HEAD`
-# REV_SHORT=`git rev-parse --short HEAD`
-# REV_LONG=`git rev-parse HEAD`
+TAG=$(git describe --abbrev=0 HEAD)
+# REV_SHORT=$(git rev-parse --short HEAD)
+# REV_LONG=$(git rev-parse HEAD)
cat <<EOF
----
diff --git a/rockspecs/gen-rockspec.sh b/rockspecs/gen-rockspec.sh
index 9fb8f88..b76394a 100755
--- a/rockspecs/gen-rockspec.sh
+++ b/rockspecs/gen-rockspec.sh
@@ -5,19 +5,20 @@ REVISION="${2:-1}"
if [ "$VERSION" = scm ]; then
WHERE=
else
- WHERE=$'\n'" tag = \"$VERSION\","
+ WHERE="
+ tag = \"$VERSION\","
VERSION="${VERSION#v}"
- VERSION="${VERSION//-/}"
+ VERSION=$(echo "$VERSION" | tr -d -)
fi
list_modules() {
- for file in $(find $1 -type f -name '*.moon'); do
- MODULE=$(echo $file | sed -e 's/\.moon$//' -e 's/\//./g')
- echo " [\"$MODULE\"] = \"$file\","
- done
+ find "$1" -type f -name '*.moon' -exec sh -c '
+ MODULE=$(echo "$1" | sed -e "s/\.moon$//" -e "s/\//./g")
+ echo " [\"$MODULE\"] = \"$1\","
+ ' sh {} \;
}
-cat <<STOP > rockspecs/alive-$VERSION-$REVISION.rockspec
+cat <<STOP > "rockspecs/alive-$VERSION-$REVISION.rockspec"
package = "alive"
version = "$VERSION-$REVISION"