Updated windows / linux scripts

RocketMod · Nov 1, 2016 · 46688f6 · 46688f6
1 parent e14ac1c
commit 46688f6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 53 deletions.
diff --git a/Rocket.Unturned/Rocket.Unturned.csproj b/Rocket.Unturned/Rocket.Unturned.csproj
@@ -142,6 +142,7 @@
     <None Include="Scripts\Linux\update.sh" />
     <None Include="Scripts\Windows\MyFirstRocketServer.bat" />
     <None Include="Scripts\Windows\start.bat" />
+    <None Include="Scripts\Windows\update.bat" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="dev\Game.exe" />

diff --git a/Rocket.Unturned/Scripts/Linux/start.sh b/Rocket.Unturned/Scripts/Linux/start.sh
@@ -5,8 +5,8 @@
 
 #CONFIG
 INSTANCE_NAME=$1
-STEAMCMD_HOME="../steamcmd"
-UNTURNED_HOME="../unturned"
+STEAMCMD_HOME="../../steamcmd"
+UNTURNED_HOME="../"
 
 #COLORS
 RED='\033[0;31m'
@@ -29,21 +29,6 @@ else
 	printf "${RED}NOT FOUND${NC}\n\n"
 fi
 
-#Update checks
-ASSEMBLIES=( "Rocket.API.dll" "Rocket.Core.dll" "Rocket.Unturned.dll" "Assembly-CSharp.dll" )
-for i in "${ASSEMBLIES[@]}"
-do
-	if [ -f ../$i ]; then
-		\cp ../$i $UNTURNED_HOME/Unturned_Headless_Data/Managed/$i
-		mv ../$i $UNTURNED_HOME/Unturned_Data/Managed/$i
-		printf "Updating "$i": ${YELLLOW}UPDATING${NC}\n\n"
-	fi
-done
-
-if [ -f ../RocketLauncher.exe ]; then
-	mv ../RocketLauncher.exe $UNTURNED_HOME/RocketLauncher.exe
-fi
-
 cd $UNTURNED_HOME
 
 if [ -f RocketLauncher.exe ]; then

diff --git a/Rocket.Unturned/Scripts/Linux/update.sh b/Rocket.Unturned/Scripts/Linux/update.sh
@@ -6,8 +6,8 @@
 
 STEAM_USERNAME=$1
 STEAM_PASSWORD=$2
-STEAMCMD_HOME="../steamcmd"
-UNTURNED_HOME="../unturned"
+STEAMCMD_HOME="../../steamcmd"
+UNTURNED_HOME="../"
 
 mkdir -p $STEAMCMD_HOME
 mkdir -p $UNTURNED_HOME

diff --git a/Rocket.Unturned/Scripts/Windows/start.bat b/Rocket.Unturned/Scripts/Windows/start.bat
@@ -15,25 +15,22 @@ IF "%~1"=="-FIXED_CTRL_C" (
 
 SET INSTANCENAME=%1
 
-SET HOME=..\
-SET UNTURNEDHOME=%HOME%Unturned
-SET STEAMHOME=%HOME%Steam\
-
-IF NOT EXIST "Unturned.exe" (
-	ECHO Steam directory: %STEAMHOME%
-	ECHO Unturned directory: %UNTURNEDHOME%
-	IF NOT EXIST %STEAMHOME% (
-		update.bat "%HOME%Unturned\" "%HOME%Steam\"
-	)
-	CD %UNTURNEDHOME%
-)
+SET UNTURNEDHOME=%~dp0..\
+SET STEAMHOME=%~dp0..\..\Steam\
+
+ECHO Steam directory: %STEAMHOME%
+ECHO Unturned directory: %UNTURNEDHOME%
 
+IF NOT EXIST %STEAMHOME% (
+	update.bat
+)
+CD %UNTURNEDHOME%
 
 :unturned
 ECHO [%time%] Unturned started.
 Unturned.exe -logFile "Servers\%INSTANCENAME%\Rocket\Unturned.log" -nographics -batchmode -silent-crashes +secureserver/%INSTANCENAME%
 ECHO [%time%] WARNING: Unturned closed or crashed, restarting.
-ping 1.1.1.1 -n 1 -w 5000 >nul
+ping 1.1.1.1 -n 1 -w 3000 >nul
 GOTO unturned
 
 :restart

diff --git a/Rocket.Unturned/Scripts/Windows/update.bat b/Rocket.Unturned/Scripts/Windows/update.bat
@@ -1,34 +1,32 @@
 @ECHO OFF 
 REM This script updates a Unturned 3 server on Windows machines
+REM To quickstart, just create a new folder and place the contents of the Rocket.Unturned download into it. Then run MyFirstRocketServer.bat
 REM Syntax: update.bat <unturned directory> <steam directory>
 REM Author: fr34kyn01535
 
-SET UNTURNEDHOME=%1
-SET STEAMHOME=%2
-IF [%1]==[] SET UNTURNEDHOME=%HOME%Unturned
-IF [%2]==[] SET STEAMHOME=%HOME%Steam\
+SET UNTURNEDHOME=%~dp0..\
+SET STEAMHOME=%~dp0..\..\Steam\
 
 
-IF NOT EXIST "%STEAMHOME%"\steamcmd.zip (
-ECHO Installing SteamCMD into Steam directory
-MKDIR "%STEAMHOME%"
-bitsadmin.exe /transfer "Downloading SteamCMD" https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip "%~dp0steamcmd.zip"
-CALL :unzip "%~dp0" "%~dp0steamcmd.zip"
-DEL steamcmd.zip
-MOVE steamcmd.exe %STEAMHOME%
+IF NOT EXIST %STEAMHOME% (
+	ECHO Installing SteamCMD into Steam directory
+	MKDIR "%STEAMHOME%"
+	bitsadmin.exe /transfer "Downloading SteamCMD" https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip "%~dp0SteamCMD.zip"
+	CALL :unzip "%~dp0" "%~dp0SteamCMD.zip"
+	DEL SteamCMD.zip
+	MOVE steamcmd.exe %STEAMHOME%
 )
 
-CD "%STEAMHOME%"
-MKDIR "%UNTURNEDHOME%"
-steamcmd.exe +login unturnedrocksupdate force_update +force_install_dir "%UNTURNEDHOME%" +app_update 304930 validate +exit
+%STEAMHOME%steamcmd.exe +login unturnedrocksupdate force_update +force_install_dir ..\Unturned +app_update 304930 validate +exit
 
-
-IF EXIST "%HOME%\Assembly-CSharp.dll" COPY "%HOME%\Assembly-CSharp.dll" "%UNTURNEDHOME%\Unturned_Data\Managed"
-IF EXIST "%HOME%\Rocket.API.dll" COPY "%HOME%\Rocket.API.dll" "%UNTURNEDHOME%\Unturned_Data\Managed"
-IF EXIST "%HOME%\Rocket.Core.dll" COPY "%HOME%\Rocket.Core.dll" "%UNTURNEDHOME%\Unturned_Data\Managed"
-IF EXIST "%HOME%\Rocket.Unturned.dll" COPY "%HOME%\Rocket.Unturned.dll" "%UNTURNEDHOME%\Unturned_Data\Managed"
-
-CD "%UNTURNEDHOME%"
+bitsadmin.exe /transfer "Downloading Rocket.Unturned" "https://ci.rocketmod.net/job/Rocket.Unturned Alpha/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket-Alpha.zip" "%~dp0Rocket.zip"
+CALL :unzip "%~dp0" "%~dp0Rocket.zip"
+XCOPY /S "Scripts" "%UNTURNEDHOME%Scripts"
+XCOPY /S "Modules" "%UNTURNEDHOME%Modules"
+DEL Rocket.zip
+RD /s /q "Scripts"
+RD /s /q "Modules"
+pause
 
 exit /b