From c043fb00ef4b404b8dc94c09c549f819b4d9c616 Mon Sep 17 00:00:00 2001 From: Phantop Date: Fri, 14 Jan 2022 13:41:46 -0500 Subject: [PATCH] Put everything through shellcheck --- AppRun | 6 +++--- appdwarf | 10 +++++----- apps/appimage | 6 +++--- apps/mkgo | 4 ++-- apps/mkjava | 6 +++--- apps/mkproton | 4 ++-- apps/mkwine | 2 +- headers | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/AppRun b/AppRun index aff9dbf..b017cc5 100755 --- a/AppRun +++ b/AppRun @@ -1,4 +1,4 @@ #!/bin/sh -HERE=$(dirname $(readlink -f "${0}")) -export LD_LIBRARY_PATH="${HERE}":$PATH -"${HERE}"/$APPDWARF_CMD "$@" +HERE=$(dirname "$(readlink -f "${0}")") +export LD_LIBRARY_PATH="${HERE}":"$PATH" +"${HERE}"/"$APPDWARF_CMD" "$@" diff --git a/appdwarf b/appdwarf index 6301724..b0ac56c 100755 --- a/appdwarf +++ b/appdwarf @@ -2,8 +2,8 @@ set -eo pipefail IFS=$'\n\t' VER=2 -HERE=$(dirname $(readlink -f "${0}")) -source $HERE/headers +HERE=$(dirname "$(readlink -f "${0}")") +source "$HERE/headers" usage(){ echo "Usage: $(basename "$0") [option] [FILE/FOLDER/URL]" @@ -14,12 +14,12 @@ usage(){ echo " -s, --separate Use old, separated header format" echo " -u, --url Fetch AppImage from URL and convert to appdwarf" - echo " -h, --help Print this help text" + echo " -h, --help iPrint this help text" echo " -v, --version Print the appdwarf version" } dwarf() { - mkdwarfs -i "$1" -o "$(realpath "$1").sh" -B$back "${@:2}" --header $HEAD + mkdwarfs -i "$1" -o "$(realpath "$1").sh" -B"$back" "${@:2}" --header "$HEAD" chmod +x "$(realpath "$1").sh" } @@ -58,7 +58,7 @@ do exit 0 ;; --folder | -f) - header_folder $(realpath $2) + header_folder "$(realpath "$2")" shift 2 ;; --lookback | -b) diff --git a/apps/appimage b/apps/appimage index 3c8a522..9769f67 100755 --- a/apps/appimage +++ b/apps/appimage @@ -1,5 +1,5 @@ #!/bin/bash LINK1=https://raw.githubusercontent.com/AppImage/appimage.github.io/master/apps/$1.md -LINK2="$(curl $LINK1 | grep -o https.\*releases | sed 's|github.com|api.github.com/repos|')" -LINK3="$(curl $LINK2 | grep -v arm64 | grep -om1 https.\*AppImage)" -appdwarf -u $LINK3 +LINK2="$(curl "$LINK1" | grep -o https.\*releases | sed 's|github.com|api.github.com/repos|')" +LINK3="$(curl "$LINK2" | grep -v arm64 | grep -om1 https.\*AppImage)" +appdwarf -u "$LINK3" diff --git a/apps/mkgo b/apps/mkgo index 661e0bb..a7c4734 100755 --- a/apps/mkgo +++ b/apps/mkgo @@ -1,9 +1,9 @@ #!/bin/bash -PATH=$(dirname $(readlink -f "${0}"))/..:$PATH +PATH=$(dirname "$(readlink -f "${0}")")/..:$PATH DIR=/tmp/dwarf-portable-executable mkdir -p $DIR LINK=$(curl -sL https://golang.org/dl | grep -om1 dl/go.\*linux-amd64.tar.gz) -curl -L https://golang.org/$LINK | tar xz -C$DIR +curl -L https://golang.org/"$LINK" | tar xz -C$DIR cat > $DIR/go/AppRun << 'EOF' #!/bin/sh diff --git a/apps/mkjava b/apps/mkjava index 6ef0d15..7c1ae81 100755 --- a/apps/mkjava +++ b/apps/mkjava @@ -1,12 +1,12 @@ #!/bin/bash -PATH=$(dirname $(readlink -f "${0}"))/..:$PATH +PATH=$(dirname "$(readlink -f "${0}")")/..:$PATH DIR=/tmp/dwarf-portable-executable/java JRE=$DIR/jre VER=$1 mkdir -p $DIR LINK=https://api.adoptium.net/v3/binary/latest/$1/ga/linux/x64/jdk/hotspot/normal/eclipse -curl -L $LINK | tar xz -C$DIR +curl -L "$LINK" | tar xz -C$DIR $DIR/jdk*/bin/jlink --add-modules ALL-MODULE-PATH --output $JRE --strip-debug --no-man-pages --no-header-files --compress=0 @@ -21,5 +21,5 @@ chmod +x $JRE/AppRun shift appdwarf $JRE $@ -mv $JRE.sh java$VER +mv $JRE.sh java"$VER" rm -rf $DIR diff --git a/apps/mkproton b/apps/mkproton index f108125..628eeed 100755 --- a/apps/mkproton +++ b/apps/mkproton @@ -1,10 +1,10 @@ #!/bin/bash -PATH=$(dirname $(readlink -f "${0}"))/..:$PATH +PATH=$(dirname "$(readlink -f "${0}")")/..:$PATH DIR=/tmp/dwarf-portable-executable/proton mkdir -p $DIR LINK="$(curl https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases | grep -om1 http.\*tar.gz)" -curl -L $LINK | tar xz -C$DIR +curl -L "$LINK" | tar xz -C$DIR mv $DIR/Proton*/files/* $DIR rm -rf $DIR/Proton*/ diff --git a/apps/mkwine b/apps/mkwine index 248bcbf..004d9ae 100755 --- a/apps/mkwine +++ b/apps/mkwine @@ -1,5 +1,5 @@ #!/bin/bash -PATH=$(dirname $(readlink -f "${0}"))/..:$PATH +PATH=$(dirname "$(readlink -f "${0}")")/..:$PATH DIR=/tmp/dwarf-portable-executable/wine mkdir -p $DIR diff --git a/headers b/headers index 7acf0db..265ed68 100755 --- a/headers +++ b/headers @@ -35,7 +35,7 @@ EOF header_folder() { echo '#!/bin/sh' > $HEAD - echo DIR=\"$1\" >> $HEAD + echo DIR=\""$1"\" >> $HEAD cat >> $HEAD << 'EOF' if [ ! -d "$DIR" ]; then mkdir "$DIR"