X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=make-windows-release;h=298b37cb9c94605e31cc04684830693286eac47d;hp=ad85b802d57988f3c89f36ccafe608468f8004de;hb=41c221c509deed7dc9c2bd8eb8c7e93563b21199;hpb=117cd6b3369c980b1276b184a27af70ba66522fb diff --git a/make-windows-release b/make-windows-release index ad85b802..298b37cb 100755 --- a/make-windows-release +++ b/make-windows-release @@ -1,16 +1,11 @@ #!/bin/bash -set -e -u +set -e WIMLIB_ARCH=i686 if [ $# -ge 1 ]; then WIMLIB_ARCH=$1 -fi - -if [ $# -ge 2 ]; then - CONF_EXTRA_ARGS="$2" -else - CONF_EXTRA_ARGS= + shift fi if [[ $WIMLIB_ARCH = i686 ]] ; then @@ -22,11 +17,14 @@ else exit 2 fi -VERSION=$(grep 'This is wimlib version' README | grep -o '[0-9]\+\.[0-9]\+\.[0-9]') +CONF_EXTRA_ARGS=("$@") + +VERSION=$(grep 'This is wimlib version' README | \ + grep -o '\<[0-9]\+\.[0-9]\+\.[0-9]\+\(-BETA\)\?\>') ZIPFILE=wimlib-${VERSION}-windows-${WIMLIB_ARCH}-bin.zip if ! grep -q "./configure --host=${WIMLIB_ARCH}-w64-mingw32" config.log; then - ./configure --host=${WIMLIB_ARCH}-w64-mingw32 $CONF_EXTRA_ARGS + ./configure --host=${WIMLIB_ARCH}-w64-mingw32 "${CONF_EXTRA_ARGS[@]}" make clean fi