Merge pull request #73 from klightspeed/1.2-dev

Merge master into 1.2-dev

README.md

@@ -26,7 +26,7 @@ NB: Change the ports according to the ones set in your `arkmanager.cfg` file.
 To install ARK Server Tools run this command:
 
 ```sh
-curl -s http://git.io/vtf5N | sudo bash -s steam
+curl -sL http://git.io/vtf5N | sudo bash -s steam
 ```
 
 NB: You may want to change the `bash -s` parameter to fit your steam user if different from `steam`.

netinstall.sh

@@ -8,8 +8,7 @@ channel=${2:-master} # if defined by 2nd argument install the defined version, o
 
 # Download and untar installation files
 cd /tmp
-wget https://github.com/FezVrasta/ark-server-tools/archive/${channel}.tar.gz
-tar -zxvf ${channel}.tar.gz
+curl -L -k -s https://github.com/FezVrasta/ark-server-tools/archive/${channel}.tar.gz | tar xz
 
 # Install ARK Server Tools
 cd ark-server-tools-${channel}/tools
@@ -19,7 +18,6 @@ sh install.sh $1 > /dev/null
 status=$?
 
 # Remove the installation files
-rm -f ${channel}.tar.gz
 rm -rf /tmp/ark-server-tools-${channel}
 
 # Print messages

tools/arkmanager

@@ -131,7 +131,7 @@ function getCurrentVersion(){
 #
 function getAvailableVersion(){
   rm -f "$steamcmd_appinfocache"
-  bnumber=`$steamcmdroot/$steamcmdexec +login anonymous +app_info_update 1 +app_info_print "$appid" +quit | while read name val; do if [ "${name}" == "{" ]; then parseSteamAppVer; break; fi; done`
+  bnumber=`$steamcmdroot/$steamcmdexec +login anonymous +app_info_update 1 +app_info_print "$appid" +quit | while read name val; do if [ "${name}" == "{" ]; then parseSteamACF ".depots.branches.public" "buildid"; break; fi; done`
   return $bnumber
 }
 

tools/arkmanager.cfg

@@ -5,7 +5,7 @@ arkstChannel="master"                                               # change it
 steamcmdroot="/home/steam/steamcmd"                                 # path of your steamcmd instance
 steamcmdexec="steamcmd.sh"                                          # name of steamcmd executable
 steamcmd_user="steam"                                               # name of the system user who own steamcmd folder
-steamcmd_appinfocache="/home/steam/Steam/appinfo.vdf"               # cache of the appinfo command
+steamcmd_appinfocache="/home/steam/Steam/appcache/appinfo.vdf"      # cache of the appinfo command
 
 # config environment
 arkserverroot="/home/steam/ARK"                                     # path of your ARK server files (default ~/ARK)