From c7a5d89e7399cd02691089ae4cc59a90327c360b Mon Sep 17 00:00:00 2001 From: Michael Martin Date: Sun, 7 Jun 2020 00:49:44 -0700 Subject: [PATCH] Improve procpkgs.sh to remove bashisms and shellcheck lints --- sc2/build/win32_install/procpkgs.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sc2/build/win32_install/procpkgs.sh b/sc2/build/win32_install/procpkgs.sh index 366690583..7e3df63cd 100755 --- a/sc2/build/win32_install/procpkgs.sh +++ b/sc2/build/win32_install/procpkgs.sh @@ -23,19 +23,21 @@ REMIX4_PKG="uqm-remix-disc4.uqm" check_pkg() { if [ ! -f "$1" ]; then - echo $1 not found. + echo "$1 not found." exit 1 fi } process_pkg() { - echo Processing $1... - local SUM=`md5sum "$1" | awk '{print $1}'` - local SZ=`wc -c "$1" | awk '{print $1}'` + echo "Processing $1..." + SUM=$(md5sum "$1" | awk '{print $1}') + SZ=$(wc -c "$1" | awk '{print $1}') SZ=$(( SZ / 1024 )) - echo "!define $2_FILE \"$1\"" >> $NSH_FILE - echo "!define $2_MD5SUM \"$SUM\"" >> $NSH_FILE - echo "!define $2_SIZE $SZ" >> $NSH_FILE + { + echo "!define $2_FILE \"$1\"" + echo "!define $2_MD5SUM \"$SUM\"" + echo "!define $2_SIZE $SZ" + } >> $NSH_FILE } check_pkg $CONTENT_PKG