From 10d163f4c5f8c2391bf3b0803c737ef593235733 Mon Sep 17 00:00:00 2001
From: Jacob Gustafson <7557867+Poikilos@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:16:18 -0500
Subject: [PATCH 1/6] Account for how qt6 & qmake-qt5 coexist & check vars.

qmake is called qmake-qt5 now, so this change will make the script work on more systems. It also allows people to set the name using MY_QMAKE, and now this script no longer overwrites the MY_QT_PATH if the user has done export MY_QT_PATH before running this script.
---
 unixBuildScript.sh | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/unixBuildScript.sh b/unixBuildScript.sh
index 2c8e6d1..62696b8 100755
--- a/unixBuildScript.sh
+++ b/unixBuildScript.sh
@@ -1,8 +1,32 @@
 #!/bin/bash
 
 # Add your QT path here by setting MY_QT_PATH variable
-# MY_QT_PATH=/YOUR_PATH_HERE/Qt/5.X/gcc_64/bin/
-MY_QT_PATH=/opt/Qt5.9.0/5.9/gcc_64/bin/
+# MY_QT_PATH=/YOUR_PATH_HERE/Qt/5.X/gcc_64/bin
+# MY_QT_PATH=/opt/Qt5.9.0/5.9/gcc_64/bin
+if [ "x$MY_QT_PATH" = "x" ]; then
+    MY_QT_PATH=/usr/bin
+fi
+if [ "x$MY_QMAKE" = "x" ]; then
+    MY_QMAKE=qmake-qt5
+fi
+if [ ! -f "$MY_QT_PATH/$MY_QMAKE" ]; then
+    >&2 cat <<END
+Error: $MY_QT_PATH/$MY_QMAKE doesn't exist. Change MY_QT_PATH to the
+directory containing qmake-qt5 and if you don't want to use qmake-qt5
+change MY_QMAKE to the path relative to MY_QT_PATH.
+END
+    if [ -f "`command -v dnf`" ]; then
+        >&2 cat <<END
+sudo dnf install -y qtbase5-dev qt5-qtscript-dev
+END
+    else
+        >&2 cat <<END
+Try installing the following packages:
+qt5-qtbase-devel qt5-qtscript-devel
+END
+    fi
+    exit 1
+fi
 BUILD_WITH_OPENGL_330_SUPPORT=$1
 
 MAKE_NUM_THREADS='-j 8'
@@ -29,7 +53,7 @@ if [ ! -e "$MY_QT_PATH" ]; then
 	echo " ---------------------------------"
 	echo "      Error: Wrong Qt path."
 	echo " ---------------------------------"
-	echo " Qt not found at '$MY_QT_PATH'."	
+	echo " Qt not found at '$MY_QT_PATH'."
 	echo " Please set the MY_QT_PATH variable in the ./unixBuildScript.sh"
 	echo ""
 	exit 1
@@ -43,9 +67,9 @@ else
     cd Sources/utils/QtnProperty
     $wget https://github.com/kmkolasinski/QtnProperty/archive/master.zip
     unzip master.zip
-    rm master.zip 
+    rm master.zip
     mv QtnProperty-master/* .
-    rm -r QtnProperty-master    
+    rm -r QtnProperty-master
     cd ../../../
 fi
 
@@ -53,7 +77,7 @@ rm .qmake.stash
 rm Makefile
 rm Sources/Makefile
 
-${MY_QT_PATH}/qmake ./AwesomeBump.pro ${QMAKE_CONFIG} \
+${MY_QT_PATH}/$MY_QMAKE ./AwesomeBump.pro ${QMAKE_CONFIG} \
     && make clean && make $MAKE_NUM_THREADS \
 	&& echo "*** Copying binary from `cat workdir/current` ..." \
 	&& cp -vr workdir/`cat workdir/current`/bin/AwesomeBump$exe ./Bin/AwesomeBump$APP_SUFFIX$exe

From fd66adcf6a0f8b5b9cb777f56b5ffc04c1d02573 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:26:26 -0500
Subject: [PATCH 2/6] Fix the usage message to say the correct package names
 and specify the necessary export commands.

---
 unixBuildScript.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/unixBuildScript.sh b/unixBuildScript.sh
index 62696b8..ce20bb5 100755
--- a/unixBuildScript.sh
+++ b/unixBuildScript.sh
@@ -9,20 +9,30 @@ fi
 if [ "x$MY_QMAKE" = "x" ]; then
     MY_QMAKE=qmake-qt5
 fi
+me="`basename $0`"
 if [ ! -f "$MY_QT_PATH/$MY_QMAKE" ]; then
     >&2 cat <<END
+
 Error: $MY_QT_PATH/$MY_QMAKE doesn't exist. Change MY_QT_PATH to the
 directory containing qmake-qt5 and if you don't want to use qmake-qt5
-change MY_QMAKE to the path relative to MY_QT_PATH.
+change MY_QMAKE to the path relative to MY_QT_PATH, then
+run:
+
+    export MY_QT_PATH
+    export MY_QMAKE
+    ./$me
+
+...or if you don't have qmake-qt5,
 END
     if [ -f "`command -v dnf`" ]; then
         >&2 cat <<END
-sudo dnf install -y qtbase5-dev qt5-qtscript-dev
+first install the following rpm packages:
+    sudo dnf install -y qt5-qtbase-devel qt5-qtscript-devel
 END
     else
         >&2 cat <<END
-Try installing the following packages:
-qt5-qtbase-devel qt5-qtscript-devel
+try installing the following deb packages:
+    qtbase5-dev qt5-qtscript-dev
 END
     fi
     exit 1

From 64ee9cf9ea56fd7340d8d3c0cd76af6ae2d6bb23 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:28:18 -0500
Subject: [PATCH 3/6] Ignore moc files.

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ab1675c..25af504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,4 +181,6 @@ Sources/AwesomeBump.pro.user.d869918
 Sources/AwesomeBump.pro.user.1ac2611
 
 build-*
-workdir
+workdir
+/Sources/main.moc
+/Sources/moc_*

From a34cadc2db16423ebde54c652a1a3b6d22c6b479 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:08:31 -0500
Subject: [PATCH 4/6] Add an install option that installs a generated XDG
 desktop shortcut.

---
 .gitignore         |  1 +
 unixBuildScript.sh | 82 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/.gitignore b/.gitignore
index 25af504..3a73d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,4 @@ build-*
 workdir
 /Sources/main.moc
 /Sources/moc_*
+/Bin/AwesomeBump.desktop
diff --git a/unixBuildScript.sh b/unixBuildScript.sh
index ce20bb5..f38f81c 100755
--- a/unixBuildScript.sh
+++ b/unixBuildScript.sh
@@ -9,6 +9,14 @@ fi
 if [ "x$MY_QMAKE" = "x" ]; then
     MY_QMAKE=qmake-qt5
 fi
+_DO_INSTALL=false
+for var in "$@"
+do
+    # Each preceding x in this file is to prevent script injection.
+    if [ "x$var" = "xinstall" ]; then
+        _DO_INSTALL=true
+    fi
+done
 me="`basename $0`"
 if [ ! -f "$MY_QT_PATH/$MY_QMAKE" ]; then
     >&2 cat <<END
@@ -37,6 +45,20 @@ END
     fi
     exit 1
 fi
+
+if [ ! -d "Sources" ]; then
+    echo "Error: Sources doesn't exist in `pwd`."
+    echo " You must run this from the AwesomeBump repo."
+    exit 1
+fi
+Icon="`pwd`/Sources/resources/icons/icon.png"  # Diffuse map
+Exec="`pwd`/Bin/AwesomeBump"
+Path="`pwd`/Bin"
+SC_NAME=AwesomeBump.desktop
+SC_TMP="$Path/$SC_NAME"
+# ^ use SC_NAME since that is also used to detect the destination.
+
+
 BUILD_WITH_OPENGL_330_SUPPORT=$1
 
 MAKE_NUM_THREADS='-j 8'
@@ -91,5 +113,65 @@ ${MY_QT_PATH}/$MY_QMAKE ./AwesomeBump.pro ${QMAKE_CONFIG} \
     && make clean && make $MAKE_NUM_THREADS \
 	&& echo "*** Copying binary from `cat workdir/current` ..." \
 	&& cp -vr workdir/`cat workdir/current`/bin/AwesomeBump$exe ./Bin/AwesomeBump$APP_SUFFIX$exe
+code=$?
+if [ $code -ne 0 ]; then
+    echo "Error: $MY_QMAKE returned code $code."
+    exit $code
+fi
 
+SC_PATH=~/Desktop/$SC_NAME
+if [ -f "$Exec" ]; then
+    echo "[$me] * Writing $SC_PATH (from $SC_TMP) for $Exec..."
+    cat >$SC_TMP <<END
+[Desktop Entry]
+Name=AwesomeBump (git)
+Exec=$Exec
+Path=$Path
+Icon=$Icon
+Terminal=false
+Type=Application
+GenericName=AwesomeBump
+Comment=AwesomeBump
+Keywords=3d;cg;texturing;bump;
+Categories=Graphics;3DGraphics;
+END
+if [ ! -f "$SC_TMP" ]; then
+    echo "Error: writing $SC_TMP failed."
+    exit 1
+fi
+chmod -x $SC_TMP
 
+if [ "x$_DO_INSTALL" = "xtrue" ]; then
+    if [ ! -f "`command -v xdg-desktop-icon`" ]; then
+        _DO_INSTALL=false
+        echo "Error: The xdg-desktop-icon command was not found, so $SC_TMP was not installed."
+    fi
+fi
+
+if [ "x$_DO_INSTALL" = "xtrue" ]; then
+    xdg-desktop-icon install $SC_TMP --novendor
+    if [ $? -ne 0 ]; then
+        echo "Installing $SC_PATH from $SC_TMP failed."
+    else
+        echo "The desktop shortcut to $Exec was installed."
+    fi
+    # chmod +x $SC_PATH
+    # ^ +x should already be done on $SC_TMP, but do it on $SC_PATH just to make sure.
+else
+    cat <<END
+To use directly from $Path, install the run-in-place icon:
+    xdg-desktop-icon install $SC_TMP --novendor
+    chmod +x $SC_PATH
+    # or run:
+    # ./$me install
+END
+fi
+
+cat <<END
+To uninstall the icon later, run:
+    xdg-desktop-icon uninstall $SC_PATH
+
+END
+else
+    echo "Error: $MY_QMAKE didn't produce '$Exec'."
+fi

From 5a6665b73cc99f08825fad958644b4a6bc6f9f52 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:26:12 -0500
Subject: [PATCH 5/6] Detect qmake-qt5 if it is in the path.

---
 unixBuildScript.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/unixBuildScript.sh b/unixBuildScript.sh
index f38f81c..4526ae2 100755
--- a/unixBuildScript.sh
+++ b/unixBuildScript.sh
@@ -3,11 +3,28 @@
 # Add your QT path here by setting MY_QT_PATH variable
 # MY_QT_PATH=/YOUR_PATH_HERE/Qt/5.X/gcc_64/bin
 # MY_QT_PATH=/opt/Qt5.9.0/5.9/gcc_64/bin
+_QMAKE_PATH=`which qmake-qt5`
+
 if [ "x$MY_QT_PATH" = "x" ]; then
+    # It was not set using `export MY_QT_PATH` before running this script,
+    #   so use the default:
     MY_QT_PATH=/usr/bin
+    # ...or detected path if present:
+    if [ -f "$_QMAKE_PATH" ]; then
+        # Get the parent directory path only:
+        MY_QT_PATH="`dirname $_QMAKE_PATH`"
+    fi
 fi
+
 if [ "x$MY_QMAKE" = "x" ]; then
+    # It was not set using `export MY_QMAKE` before running this script,
+    #   so use the default:
     MY_QMAKE=qmake-qt5
+    # ...or detected path if present:
+    if [ -f "$_QMAKE_PATH" ]; then
+        # Get the filename only (not path):
+        MY_QMAKE="`basename $_QMAKE_PATH`"
+    fi
 fi
 _DO_INSTALL=false
 for var in "$@"

From e7786e2b76d6fadb99e996567c3aeb355f33a75d Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Wed, 11 Jan 2023 00:36:39 -0500
Subject: [PATCH 6/6] Note the origin of the values of environment variables.

---
 unixBuildScript.sh | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/unixBuildScript.sh b/unixBuildScript.sh
index 4526ae2..e15b22f 100755
--- a/unixBuildScript.sh
+++ b/unixBuildScript.sh
@@ -3,28 +3,40 @@
 # Add your QT path here by setting MY_QT_PATH variable
 # MY_QT_PATH=/YOUR_PATH_HERE/Qt/5.X/gcc_64/bin
 # MY_QT_PATH=/opt/Qt5.9.0/5.9/gcc_64/bin
-_QMAKE_PATH=`which qmake-qt5`
+_SYSTEM_QMAKE=`which qmake-qt5`
 
 if [ "x$MY_QT_PATH" = "x" ]; then
+    >&2 echo "MY_QT_PATH was not set..."
     # It was not set using `export MY_QT_PATH` before running this script,
     #   so use the default:
     MY_QT_PATH=/usr/bin
     # ...or detected path if present:
-    if [ -f "$_QMAKE_PATH" ]; then
+    if [ -f "$_SYSTEM_QMAKE" ]; then
         # Get the parent directory path only:
-        MY_QT_PATH="`dirname $_QMAKE_PATH`"
+        MY_QT_PATH="`dirname $_SYSTEM_QMAKE`"
+        echo "MY_QT_PATH=$MY_QT_PATH (detected `basename $_SYSTEM_QMAKE` in the PATH)"
+    else
+        echo "MY_QT_PATH=$MY_QT_PATH (default)"
     fi
+else
+    echo "MY_QT_PATH=$MY_QT_PATH (was set in environment)"
 fi
 
 if [ "x$MY_QMAKE" = "x" ]; then
+    >&2 echo "MY_QMAKE was not set..."
     # It was not set using `export MY_QMAKE` before running this script,
     #   so use the default:
     MY_QMAKE=qmake-qt5
     # ...or detected path if present:
-    if [ -f "$_QMAKE_PATH" ]; then
+    if [ -f "$_SYSTEM_QMAKE" ]; then
         # Get the filename only (not path):
-        MY_QMAKE="`basename $_QMAKE_PATH`"
+        MY_QMAKE="`basename $_SYSTEM_QMAKE`"
+        echo "MY_QMAKE=$MY_QMAKE (detected `basename $_SYSTEM_QMAKE` in the PATH)"
+    else
+        echo "MY_QMAKE=$MY_QMAKE (default)"
     fi
+else
+    echo "MY_QMAKE=$MY_QMAKE (was set in environment)"
 fi
 _DO_INSTALL=false
 for var in "$@"
@@ -75,7 +87,6 @@ SC_NAME=AwesomeBump.desktop
 SC_TMP="$Path/$SC_NAME"
 # ^ use SC_NAME since that is also used to detect the destination.
 
-
 BUILD_WITH_OPENGL_330_SUPPORT=$1
 
 MAKE_NUM_THREADS='-j 8'