Revert directory name and version

Author: kvakvs

.github/scripts/build-macos-wxwidgets.sh

@@ -22,31 +22,34 @@
 
 set -e
 
-export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)
+MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)
+export MAKEFLAGS
 
 if [ -z "$WXWIDGETS_VERSION" ]; then
   WXWIDGETS_VERSION=3.1.5
 fi
 
 vsn=$WXWIDGETS_VERSION
+WXWIDGETS_BUILD_DIR=$(pwd)/wxWidgets
 
-if [ -d "wxWidgets-build" ]; then
-  echo "wxWidgets-build/ containing wxWidgets already exists; reusing it..."
+if [ -d "${WXWIDGETS_BUILD_DIR}" ]; then
+  echo "${WXWIDGETS_BUILD_DIR}/ containing wxWidgets source already exists; reusing it..."
 else
-  curl --fail -LO https://github.com/wxWidgets/wxWidgets/releases/download/v$vsn/wxWidgets-$vsn.tar.bz2
-  tar -xf wxWidgets-$vsn.tar.bz2
-  rm -rf wxWidgets-build && mv wxWidgets-$vsn/ wxWidgets-build
+  curl --fail -LO https://github.com/wxWidgets/wxWidgets/releases/download/v"$vsn"/wxWidgets-"$vsn".tar.bz2
+  tar -xf wxWidgets-"$vsn".tar.bz2
+  rm -rf "${WXWIDGETS_BUILD_DIR}" && mv wxWidgets-"$vsn"/ "${WXWIDGETS_BUILD_DIR}"
 
   # Replace #include <fp.h> in pngpriv.h to #include <math.h> for MacOS build.
-  sed -i '' -E 's/^#[[:space:]]*include[[:space:]]*<fp\.h>/#include <math.h>/' "wxWidgets-build/src/png/pngpriv.h"
+  sed -i '' -E 's/^#[[:space:]]*include[[:space:]]*<fp\.h>/#include <math.h>/' "${WXWIDGETS_BUILD_DIR}/src/png/pngpriv.h"
+
   # Find and comment out #define fdopen NULL in zutil.h and let it use default MacOS impl
-  sed -i '' -E 's/^([[:space:]]*#[[:space:]]*define[[:space:]]+fdopen.*)$//' "wxWidgets-build/src/zlib/zutil.h"
+  sed -i '' -E 's/^([[:space:]]*#[[:space:]]*define[[:space:]]+fdopen.*)$//' "${WXWIDGETS_BUILD_DIR}/src/zlib/zutil.h"
 fi
 
-cd wxWidgets-build
+cd "${WXWIDGETS_BUILD_DIR}"
 ./configure \
   --disable-shared \
-  --prefix=$PWD/release \
+  --prefix="$PWD"/release \
   --with-cocoa \
   --with-macosx-version-min=10.15 \
   --disable-sys-libs