Scripts: Remove some subshells that ignore errors

fetch-geoip.sh

@@ -9,7 +9,8 @@
 set -o errexit || exit $?
 
 # Set the working directory to the location of this script
-cd "$(dirname "$0")" || exit 1
+HERE=$(dirname "$0")
+cd "${HERE}" || exit 1
 
 # Database does not exist or is older than 30 days.
 if [ -z "$(find . -path ./IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP -mtime -30 -print)" ]; then

packaging/linux/AppRun.in

@@ -1,7 +1,8 @@
 #!/bin/sh
 set -o errexit || exit $?
 
-HERE="$(dirname "$(readlink -f "${0}")")"
+LAUNCHER=$(readlink -f "${0}")
+HERE=$(dirname "${LAUNCHER}")
 
 # Run the game or server
 if [ -n "$1" ] && [ "$1" = "--server" ]; then

packaging/linux/buildpackage.sh

@@ -14,7 +14,8 @@ if [ $# -eq "0" ]; then
 fi
 
 # Set the working dir to the location of this script
-cd "$(dirname "$0")" || exit 1
+HERE=$(dirname "$0")
+cd "${HERE}" || exit 1
 . ../functions.sh
 
 TAG="$1"

packaging/linux/openra-server.appimage.in

@@ -1,7 +1,8 @@
 #!/bin/sh
 set -o errexit || exit $?
 
-HERE="$(dirname "$(readlink -f "${0}")")"
+LAUNCHER=$(readlink -f "${0}")
+HERE=$(dirname "${LAUNCHER}")
 cd "${HERE}/../lib/openra" || exit 1
 
 ./OpenRA.Server Game.Mod="{MODID}" "$@"

packaging/linux/openra-utility.appimage.in

@@ -2,5 +2,6 @@
 set -o errexit || exit $?
 
 # OpenRA.Utility relies on keeping the original working directory, so don't change directory
-HERE="$(dirname "$(readlink -f "${0}")")"
+LAUNCHER=$(readlink -f "${0}")
+HERE=$(dirname "${LAUNCHER}")
 "${HERE}/../lib/openra/OpenRA.Utility" {MODID} "$@"

packaging/macos/buildpackage.sh

@@ -29,7 +29,8 @@ if [[ "${OSTYPE}" != "darwin"* ]]; then
 fi
 
 # Set the working dir to the location of this script
-cd "$(dirname "${0}")" || exit 1
+HERE=$(dirname "${0}")
+cd "${HERE}" || exit 1
 . ../functions.sh
 
 # Import code signing certificate

packaging/source/buildpackage.sh

@@ -9,7 +9,8 @@ if [ $# -ne "2" ]; then
 fi
 
 # Set the working dir to the location of this script
-cd "$(dirname "$0")" || exit 1
+HERE=$(dirname "$0")
+cd "${HERE}" || exit 1
 
 TAG="$1"
 OUTPUTDIR="$2"

packaging/windows/buildpackage.sh

@@ -15,7 +15,8 @@ if [ $# -ne "2" ]; then
 fi
 
 # Set the working dir to the location of this script
-cd "$(dirname "$0")" || exit 1
+HERE=$(dirname "$0")
+cd "${HERE}" || exit 1
 . ../functions.sh
 
 TAG="$1"