Fix: switch to linuxdeploy from linuxdeployqt

generic-linux/build-and-make-installer.sh

@@ -1,57 +1,101 @@
 #!/bin/bash
+############################################################################
+#    Copyright (C) 2017-2018 by Keneanung <[email protected]>      #
+#    Copyright (C) 2025 by Stephen Lyons       - <[email protected]> #
+#                                                                          #
+#    This program is free software; you can redistribute it and/or modify  #
+#    it under the terms of the GNU General Public License as published by  #
+#    the Free Software Foundation; either version 2 of the License, or     #
+#    (at your option) any later version.                                   #
+#                                                                          #
+#    This program is distributed in the hope that it will be useful,       #
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of        #
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         #
+#    GNU General Public License for more details.                          #
+#                                                                          #
+#    You should have received a copy of the GNU General Public License     #
+#    along with this program; if not, write to the                         #
+#    Free Software Foundation, Inc.,                                       #
+#    59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             #
+############################################################################
 
 # abort script if any command fails
 set -e
 
 # extract program name for message
-pgm=$(basename "$0")
+PGM=$(basename "$0")
 
+# Where to put the Mudlet source code:
+if [ -z "${SOURCE_DIR}" ]; then
+  SOURCE_DIR="$(pwd)/working"
+  export SOURCE_DIR
+fi
+
+if [ -n "$(echo "${SOURCE_DIR}" | cut -s -d_ -f2- )" ]; then
+  echo "Unfortunately the SOURCE_DIR is: \"${SOURCE_DIR}\" and it contains"
+  echo "one or more '_' characters and this will break something in the"
+  echo "make-install.sh script - aborting..."
+  exit 1
+fi
+
+echo "Working in: '${SOURCE_DIR}'"
+# Used within this script AND the make-installer one and needed in the latter
+# to force a Qt6 build rather than Qt5:
+QMAKE="$(which qmake6)"
+export QMAKE
 # Retrieve latest source code, keep history as it's useful to edit sometimes
 # if it's already there, keep it as is
-if [ ! -d "source" ]; then
+if [ ! -d "${SOURCE_DIR}" ]; then
   # check command line option for commit-ish that should be checked out
-  commitish="$1"
-  if [ -z "$commitish" ]; then
-    echo "No 'source' folder exists and no commit-ish given."
-    echo "Usage: $pgm <commit-ish>"
+  COMMITISH="$1"
+  if [ -z "${COMMITISH}" ]; then
+    echo "No 'SOURCE_DIR' environmental variable exists and no commit-ish given."
+    echo "Usage: ${PGM} <commit-ish>"
     exit 2
   fi
 
-  git clone --recursive https://github.com/Mudlet/Mudlet.git source
+  git clone https://github.com/Mudlet/Mudlet.git "${SOURCE_DIR}"
 
-  # Switch to $commitish
-  (cd source && git checkout "${commitish}")
+  # Switch to ${COMMITISH}
+  (cd "${SOURCE_DIR}" && git checkout "${COMMITISH}")
 fi
 
 # set the commit ID so the build can reference it later
-cd source
-commit=$(git rev-parse --short HEAD)
+# This path/location is effectively hard coded into this AND the
+# make-installer.sh script:
+cd "${SOURCE_DIR}"
+COMMIT=$(git rev-parse --short HEAD)
 
 # linux assumes compile time dependencies are installed to make this
 # (hopefully) distribution independent
 
 # Add commit information to version and extract version info itself
-cd src/
+cd "${SOURCE_DIR}"/src/
 # find out if we do a dev or a release build
-dev=$(perl -lne 'print $1 if /^BUILD = (.*)$/' < mudlet.pro)
-if [ ! -z "${dev}" ]; then
-  MUDLET_VERSION_BUILD="-dev-$commit"
+DEV=$(perl -lne 'print $1 if /^BUILD = (.*)$/' < mudlet.pro)
+if [ -n "${DEV}" ]; then
+  MUDLET_VERSION_BUILD="-dev-${COMMIT}"
   export MUDLET_VERSION_BUILD
 fi
-version=$(perl -lne 'print $1 if /^VERSION = (.+)/' < mudlet.pro)
+
+VERSION=$(perl -lne 'print $1 if /^VERSION = (.+)/' < mudlet.pro)
+
 cd ..
 
-mkdir -p build
-cd build/
+BUILD_DIR="${SOURCE_DIR}"/build
+export BUILD_DIR
+
+mkdir -p "${BUILD_DIR}"
+cd "${BUILD_DIR}"
 
 # Compile using all available cores
-qmake ../src/mudlet.pro
+"${QMAKE}" "${SOURCE_DIR}"/src/mudlet.pro
 make -j "$(nproc)"
 
 # now run the actual installer creation script
 cd ../..
-if [ ! -z "${dev}" ]; then
-  ./make-installer.sh "${version}${MUDLET_VERSION_BUILD}"
+if [ -n "${DEV}" ]; then
+  ./make-installer.sh "${VERSION}${MUDLET_VERSION_BUILD}"
 else
-  ./make-installer.sh -r "${version}"
+  ./make-installer.sh -r "${VERSION}"
 fi