Slightly nicer way to get the BASEDIR

Change-Id: I10d6bfe317653881e4b0af603d44ce2a6a435004
Reviewed-on: http://gerrit.dmdirc.com/1276
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

installer/linux/getjre.sh

@@ -27,15 +27,7 @@ else
 fi
 
 # Find out where we are
-BASEDIR=${0%/*}
-if [ "${BASEDIR}" = "${0}" ]; then
-	BASEDIR=`which $0`
-	BASEDIR=${BASEDIR%/*}
-fi
-CHECKBASEDIR=`echo "${BASEDIR}" | sed 's#^/##'`
-if [ "${CHECKBASEDIR}" = "${BASEDIR}" ]; then
-	BASEDIR=${PWD}/${BASEDIR}
-fi;
+BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
 
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then

installer/linux/installjre.sh

@@ -42,15 +42,7 @@ else
 fi
 
 # Find out where we are
-BASEDIR=${0%/*}
-if [ "${BASEDIR}" = "${0}" ]; then
-	BASEDIR=`which $0`
-	BASEDIR=${BASEDIR%/*}
-fi
-CHECKBASEDIR=`echo "${BASEDIR}" | sed 's#^/##'`
-if [ "${CHECKBASEDIR}" = "${BASEDIR}" ]; then
-	BASEDIR=${PWD}/${BASEDIR}
-fi;
+BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
 
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then

installer/linux/setup.sh

@@ -47,15 +47,7 @@ else
 fi
 
 # Find out where we are
-BASEDIR=${0%/*}
-if [ "${BASEDIR}" = "${0}" ]; then
-	BASEDIR=`which $0`
-	BASEDIR=${BASEDIR%/*}
-fi
-CHECKBASEDIR=`echo "${BASEDIR}" | sed 's#^/##'`
-if [ "${CHECKBASEDIR}" = "${BASEDIR}" ]; then
-	BASEDIR=${PWD}/${BASEDIR}
-fi;
+BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
 
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then

installer/linux/uninstall.sh

@@ -24,15 +24,7 @@ else
 fi
 
 # Find out where we are
-BASEDIR=${0%/*}
-if [ "${BASEDIR}" = "${0}" ]; then
-	BASEDIR=`which $0`
-	BASEDIR=${BASEDIR%/*}
-fi
-CHECKBASEDIR=`echo "${BASEDIR}" | sed 's#^/##'`
-if [ "${CHECKBASEDIR}" = "${BASEDIR}" ]; then
-	BASEDIR=${PWD}/${BASEDIR}
-fi;
+BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
 
 if [ ! -e ${BASEDIR}/.uninstall.conf ]; then
 	echo "No .uninstall.conf found, unable to continue."

launcher/unix/DMDirc.sh

@@ -52,15 +52,7 @@ else
 fi
 
 # Find out where we are
-BASEDIR=${0%/*}
-if [ "${BASEDIR}" = "${0}" ]; then
-	BASEDIR=`which $0`
-	BASEDIR=${BASEDIR%/*}
-fi
-CHECKBASEDIR=`echo "${BASEDIR}" | sed 's#^/##'`
-if [ "${CHECKBASEDIR}" = "${BASEDIR}" ]; then
-	BASEDIR=${PWD}/${BASEDIR}
-fi;
+BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
 
 # Store params so that we can pass them back to the client
 for param in "$@"; do

updateBundledPlugins.sh

@@ -5,16 +5,7 @@
 # the names and versions to the jar's version.config file.
 
 # Find out where we are
-BASEDIR=${0%/*}
-if [ "${BASEDIR}" = "${0}" ]; then
-	BASEDIR=`which $0`
-	BASEDIR="${BASEDIR%/*}"
-fi
-CHECKBASEDIR=`echo "${BASEDIR}" | sed 's#^/##'`
-
-if [ "${CHECKBASEDIR}" = "${BASEDIR}" -a "${PWD}" != "${CHECKBASEDIR}" -a "${PWD}/." != "${CHECKBASEDIR}" ]; then
-	BASEDIR="${PWD}/${BASEDIR}"
-fi;
+BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
 
 if [ -e "${BASEDIR}/build-functions.sh" ]; then
 	. "${BASEDIR}/build-functions.sh"