Fix whitespace.

files/bin/dz-common

@@ -29,14 +29,17 @@ export yellow="\e[93m"
 export lightblue="\e[94m"
 export blue="\e[34m"
 export magenta="\e[35m"
-export 	cyan="\e[36m"
+export cyan="\e[36m"
 
 # DayZ release server Steam app ID.
 # Now that the Linux server is released, the binaries will come from this ID.
 export release_server_appid=223350
 
-# Leaving the experimental server appid here to allow for the use of the experimental server.
-#export release_server_appid=1042420
+# Allow for the use of experimental via an environment variable
+if [ ${EXPERIMENTAL} != "" ]
+then
+	export release_server_appid=1042420
+fi
 
 # DayZ release client SteamID. This is for mods, as only the release client has them.
 export release_client_appid=221100
@@ -51,6 +54,18 @@ export SERVER_FILES="/serverfiles"
 # Used to check if dayZ is installed
 export SERVER_INSTALL_FILE="${SERVER_FILES}/DayZServer"
 
+if [ -f ${SERVER_INSTALL_FILE} ]
+then
+        # Release or Experimental
+        if [[ ${release_server_appid} = "223350" ]]
+        then
+                RELEASE="Stable"
+        else
+                RELEASE="Experimental"
+        fi
+	VERSION=$(strings /serverfiles/DayZServer | grep -P "1\.\d{2}\.\d{6}")" - ${RELEASE}"
+fi
+
 # Steam files
 export STEAM_LOGIN="${HOME}/steamlogin"
 export STEAMCMD=steamcmd

server/bin/dz

@@ -579,14 +579,6 @@ status(){
 		RUNNING="${RUNNING}\nRunning parameters: ${green}$(cat /tmp/parameters)\nRunning mod parameter: $(cat /tmp/mod_command_line)${default}"
 		RUNNING="${RUNNING}\nRunning server parameter: ${green}$(cat /tmp/server_command_line)${default}"
 	fi
-	# Release or Experimental
-	if [[ ${release_client_appid} = "221100" ]]
-	then
-		RELEASE="Stable"
-	else
-		RELEASE="Experimental"
-	fi
-	VERSION="$(cat /serverfiles/version) - Release: ${RELEASE}"
 	# Map
 	MAP=${MAP}
 	# Number of mods plus the list denoting on or off

web/bin/dz

@@ -204,7 +204,6 @@ install(){
 	else
 		printf "[ ${lightblue}DayZ${default} ] The server is already installed.\n"
 	fi
-	putVersion
 }
 
 # Update the server files.
@@ -250,25 +249,6 @@ update(){
 		printf "\tAvailable version: ${green}${availablebuild}${default}\n"
 		printf "\thttps://steamdb.info/app/${release_server_appid}/\n\n"
 	fi
-	putVersion
-}
-
-function putVersion() {
-	# Put the version in a file for easy access
-	BUILDID=$(grep buildid /serverfiles/steamapps/appmanifest_223350.acf | awk '{print $2}' | tr -d '"')
-	# FIXME! Get the server version from the buildid...somehow
-	echo "1.28.160123" > /serverfiles/version
-}
-
-function getVersion() {
-	VERSION=$(cat /serverfiles/version)
-	if [[ ${release_client_appid} = "221100" ]]
-	then
-		RELEASE="Stable"
-	else
-		RELEASE="Experimental"
-	fi
-	echo "${VERSION} - Release: ${RELEASE}"
 }
 
 # Update mods
@@ -291,7 +271,6 @@ status(){
 	if [ -f "${SERVER_INSTALL_FILE}" ]
 	then
 		INSTALLED="${YES}"
-		VERSION=$(getVersion)
 	fi
 	# Logged into Steam
 	if [ -f "${STEAM_LOGIN}" ]