Fix Shellcheck warning in makewin.sh

Also see http://github.com/koalaman/shellcheck. It should be available for install on your Linux box from the package manager.

diff --git a/makewin.sh b/makewin.sh
index 73b458cfef98581114889d5505e7ff6d881589e3..426719e8ac0f3bfd140cb6e0c87ebfa922ba3eec 100755 (executable)
--- a/makewin.sh
+++ b/makewin.sh
@@ -1,8 +1,10 @@
+#!/usr/bin/env bash
+
 # compile ldns for windows
-cdir=`echo ldns.win.$$`
-tmpdir=`pwd`
-mkdir $cdir
-cd $cdir
+cdir="$(echo ldns.win.$$)"
+tmpdir=$(pwd)
+mkdir "$cdir"
+cd "$cdir"
 #configure="mingw32-configure"
 #strip="i686-w64-mingw32-strip"
 #warch="i686"
@@ -25,7 +27,7 @@ info () {
 error_cleanup () {
        echo "$1"
        cd "$tmpdir"
-       rm -rf $cdir
+       rm -rf "$cdir"
        exit 1
 }
 
@@ -78,9 +80,9 @@ if [ -z "$CHECKOUT" ]
 then
         if [ "$RC" = "no" ]
         then
-                CHECKOUT=`(git status | head -1 | awk '{print$3}') || echo master`
+                CHECKOUT=$( (git status | head -n 1 | awk '{print$3}') || echo master)
         else
-                CHECKOUT=`(git status | head -1 | awk '{print$3}') || echo develop`
+                CHECKOUT=$( (git status | head -n 1 | awk '{print$3}') || echo develop)
         fi
 fi
 
@@ -107,7 +109,7 @@ git clone git://git.nlnetlabs.nl/ldns/ ldns-nonstatic || error_cleanup "git comm
 
 # Fix up the version number if necessary
 (cd ldns; if test ! -f install-sh -a -f ../../install-sh; then cp ../../install-sh . ; fi; libtoolize -ci; autoreconf -fi)
-version=`./ldns/configure --version | head -1 | awk '{ print $3 }'` || \
+version=$(./ldns/configure --version | head -1 | awk '{ print $3 }') || \
     error_cleanup "Cannot determine version number."
 info "LDNS version: $version"
 if [ "$RC" != "no" ]; then
@@ -120,7 +122,7 @@ if [ "$RC" != "no" ]; then
 fi
 if [ "$SNAPSHOT" = "yes" ]; then
        info "Building LDNS snapshot."
-       version2="${version}_`date +%Y%m%d`"
+       version2="${version}_$(date +%Y%m%d)"
        info "Snapshot version number: $version2"
        replace_text "ldns/configure.ac" "AC_INIT(ldns, $version" "AC_INIT(ldns, $version2"
        replace_text "ldns-nonstatic/configure.ac" "AC_INIT(ldns, $version" "AC_INIT(ldns, $version2"
@@ -128,8 +130,8 @@ if [ "$SNAPSHOT" = "yes" ]; then
 fi
 
 # Build OpenSSL
-gzip -cd $WINSSL | tar xf - || error_cleanup "tar unpack of $WINSSL failed"
-sslinstall="`pwd`/sslinstall"
+gzip -cd "$WINSSL" | tar xf - || error_cleanup "tar unpack of $WINSSL failed"
+sslinstall="$(pwd)/sslinstall"
 cd openssl-* || error_cleanup "no openssl-X dir in tarball"
 if test $configure = "mingw64-configure"; then
        sslflags="no-shared no-asm -DOPENSSL_NO_CAPIENG mingw64"
@@ -137,7 +139,7 @@ else
        sslflags="no-shared no-asm -DOPENSSL_NO_CAPIENG mingw"
 fi
 info "winssl: Configure $sslflags"
-CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
+CC="${warch}-w64-mingw32-gcc" AR="${warch}-w64-mingw32-ar" RANLIB="${warch}-w64-mingw32-ranlib" WINDRES="${warch}-w64-mingw32-windres" ./Configure --prefix="$sslinstall" "$sslflags" || error_cleanup "OpenSSL Configure failed"
 info "winssl: make"
 make || error_cleanup "make failed for $WINSSL"
 info "winssl: make install_sw"
@@ -146,7 +148,7 @@ cross_flag="$cross_flag --with-ssl=$sslinstall"
 cd ..
 
 # Build ldns
-ldnsinstall="`pwd`/ldnsinstall"
+ldnsinstall="$(pwd)/ldnsinstall"
 cd ldns
 info "ldns: autoconf"
 # cp install-sh because one at ../.. means libtoolize won't install it for us.
@@ -155,7 +157,7 @@ libtoolize -ci
 autoreconf -fi
 ldns_flag="--with-examples --with-drill"
 info "ldns: Configure $cross_flag $ldns_flag"
-$configure $cross_flag $ldns_flag || error_cleanup "ldns configure failed"
+$configure "$cross_flag" "$ldns_flag" || error_cleanup "ldns configure failed"
 info "ldns: make"
 make || error_cleanup "ldns make failed"
 # do not strip debug symbols, could be useful for stack traces
@@ -165,18 +167,18 @@ DESTDIR=$ldnsinstall make install || error_cleanup "ldns make install failed"
 cd ..
 
 # Build OpenSSL nonstatic
-sslinstallnonstatic="`pwd`/sslinstallnonstatic"
+sslinstallnonstatic="(pwd)/sslinstallnonstatic"
 mkdir openssl-nonstatic
 cd openssl-nonstatic
 # remove openssl-a.b.c/ and put in openssl-nonstatic directory
-gzip -cd $WINSSL | tar xf - --strip-components=1 || error_cleanup "tar unpack of $WINSSL failed"
-if test $configure = "mingw64-configure"; then
+gzip -cd "$WINSSL" | tar xf - --strip-components=1 || error_cleanup "tar unpack of $WINSSL failed"
+if test "$configure" = "mingw64-configure"; then
        sslflags_nonstatic="shared no-asm -DOPENSSL_NO_CAPIENG mingw64"
 else
        sslflags_nonstatic="shared no-asm -DOPENSSL_NO_CAPIENG mingw"
 fi
 info "winsslnonstatic: Configure $sslflags_nonstatic"
-CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstallnonstatic" $sslflags_nonstatic || error_cleanup "OpenSSL Configure failed"
+CC="${warch}-w64-mingw32-gcc" AR="${warch}-w64-mingw32-ar" RANLIB="${warch}-w64-mingw32-ranlib" WINDRES="${warch}-w64-mingw32-windres" ./Configure --prefix="$sslinstallnonstatic" "$sslflags_nonstatic" || error_cleanup "OpenSSL Configure failed"
 info "winsslnonstatic: make"
 make || error_cleanup "make failed for $WINSSL"
 info "winsslnonstatic: make install_sw"
@@ -185,7 +187,7 @@ cross_flag_nonstatic="$cross_flag_nonstatic --with-ssl=$sslinstallnonstatic"
 cd ..
 
 # Build ldns nonstatic
-ldnsinstallnonstatic="`pwd`/ldnsinstall-nonstatic"
+ldnsinstallnonstatic="$(pwd)/ldnsinstall-nonstatic"
 cd ldns-nonstatic
 info "ldnsnonstatic: autoconf"
 # cp install-sh because one at ../.. means libtoolize won't install it for us.
@@ -194,7 +196,7 @@ libtoolize -ci
 autoreconf -fi
 ldns_flag_nonstatic="--with-examples --with-drill"
 info "ldnsnonstatic: Configure $cross_flag_nonstatic $ldns_flag_nonstatic"
-$configure $cross_flag_nonstatic $ldns_flag_nonstatic || error_cleanup "ldns configure failed"
+$configure "$cross_flag_nonstatic" "$ldns_flag_nonstatic" || error_cleanup "ldns configure failed"
 info "ldnsnonstatic: make"
 make || error_cleanup "ldns make failed"
 # do not strip debug symbols, could be useful for stack traces
@@ -205,57 +207,57 @@ cd ..
 
 # create zipfile
 file="ldns-$version.zip"
-rm -f $file
+rm -f "$file"
 info "Creating $file"
 mkdir file
 cd file
 installplace="$ldnsinstall/usr/$warch-w64-mingw32/sys-root/mingw"
 installplacenonstatic="$ldnsinstallnonstatic/usr/$warch-w64-mingw32/sys-root/mingw"
-cp $installplace/lib/libldns.a .
-cp $installplacenonstatic/lib/libldns.dll.a .
-cp $installplacenonstatic/bin/*.dll .
-cp $sslinstallnonstatic/lib/*.dll.a .
-cp $sslinstallnonstatic/bin/*.dll .
-cp $sslinstallnonstatic/lib/engines-*/*.dll .
+cp "$installplace"/lib/libldns.a .
+cp "$installplacenonstatic"/lib/libldns.dll.a .
+cp "$installplacenonstatic"/bin/*.dll .
+cp "$sslinstallnonstatic"/lib/*.dll.a .
+cp "$sslinstallnonstatic"/bin/*.dll .
+cp "$sslinstallnonstatic"/lib/engines-*/*.dll .
 cp ../ldns/LICENSE .
 cp ../ldns/README .
 cp ../ldns/Changelog .
 info "copy static exe"
-for x in $installplace/bin/* ; do
-       cp $x `basename $x`.exe
+for x in "$installplace"/bin/* ; do
+       cp "$x" "$(basename "$x").exe"
 done
 # but the shell script stays a script file
 mv ldns-config.exe ldns-config
 info "copy include"
 mkdir include
 mkdir include/ldns
-cp $installplace/include/ldns/*.h include/ldns/.
+cp "$installplace"/include/ldns/*.h include/ldns/.
 info "copy man1"
 mkdir man1
-cp $installplace/share/man/man1/* man1/.
+cp "$installplace"/share/man/man1/* man1/.
 info "copy man3"
 mkdir man3
-cp $installplace/share/man/man3/* man3/.
+cp "$installplace"/share/man/man3/* man3/.
 info "create cat1"
 mkdir cat1
-for x in man1/*.1; do groff -man -Tascii -Z $x | grotty -cbu > cat1/`basename $x .1`.txt; done
+for x in man1/*.1; do groff -man -Tascii -Z "$x" | grotty -cbu > cat1/"$(basename "$x" .1).txt"; done
 info "create cat3"
 mkdir cat3
-for x in man3/*.3; do groff -man -Tascii -Z $x | grotty -cbu > cat3/`basename $x .3`.txt; done
-rm -f ../../$file
+for x in man3/*.3; do groff -man -Tascii -Z "$x" | grotty -cbu > cat3/"$(basename "$x" .3).txt"; done
+rm -f "../../$file"
 info "$file contents"
 # show contents of directory we are zipping up.
-du -s *
+du -s ./*
 # zip it
 info "zip $file"
-zip -r ../../$file LICENSE README libldns.a *.dll *.dll.a Changelog *.exe include man1 man3 cat1 cat3
+zip -r ../../"$file" LICENSE README libldns.a *.dll *.dll.a Changelog *.exe include man1 man3 cat1 cat3
 info "Testing $file"
-(cd ../.. ; zip -T $file ) || error_cleanup "errors in zipfile $file"
+(cd ../.. ; zip -T "$file" ) || error_cleanup "errors in zipfile $file"
 cd ..
 
 # cleanup before exit
 cd "$tmpdir"
-rm -rf $cdir
+rm -rf "$cdir"
 echo "done"
 # display
-ls -lG $file
+ls -lG "$file"