From ae9a6695b0a4fe3ead8ab4a5d4774fd4d2e8238c Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Fri, 3 Mar 2017 17:34:21 +0100
Subject: [PATCH] v0.5.2 updated. Messed up something in scripts about paths
 containing spaces.

---
 packaging/Linux/ATCS/ATCS.cmd        | 12 ++++-----
 packaging/Windows/ATCS.cmd           | 12 ++++-----
 packaging/Windows/ATCS_Installer.nsi | 40 ++++++++++++++--------------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packaging/Linux/ATCS/ATCS.cmd b/packaging/Linux/ATCS/ATCS.cmd
index 4192378..d6d5344 100644
--- a/packaging/Linux/ATCS/ATCS.cmd
+++ b/packaging/Linux/ATCS/ATCS.cmd
@@ -8,13 +8,13 @@ set JAVA_OPTS=
 set ENV_FILE=%ATCS_DIR%ATCS.env.bat
 set MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio
 
-if exist %ENV_FILE% (
-  call %ENV_FILE%
+if exist "%ENV_FILE%" (
+  call "%ENV_FILE%"
 ) else (
-  echo REM set MAX_MEM=%MAX_MEM% > %ENV_FILE%
-  echo REM set JAVA=%JAVA% >> %ENV_FILE%
-  echo REM set JAVA_OPTS=%JAVA_OPTS% >> %ENV_FILE%
-  echo. >> %ENV_FILE%
+  echo REM set MAX_MEM=%MAX_MEM% > "%ENV_FILE%"
+  echo REM set JAVA=%JAVA% >> "%ENV_FILE%"
+  echo REM set JAVA_OPTS=%JAVA_OPTS% >> "%ENV_FILE%"
+  echo. >> "%ENV_FILE%"
 )
 
 start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%
diff --git a/packaging/Windows/ATCS.cmd b/packaging/Windows/ATCS.cmd
index 4192378..d6d5344 100644
--- a/packaging/Windows/ATCS.cmd
+++ b/packaging/Windows/ATCS.cmd
@@ -8,13 +8,13 @@ set JAVA_OPTS=
 set ENV_FILE=%ATCS_DIR%ATCS.env.bat
 set MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio
 
-if exist %ENV_FILE% (
-  call %ENV_FILE%
+if exist "%ENV_FILE%" (
+  call "%ENV_FILE%"
 ) else (
-  echo REM set MAX_MEM=%MAX_MEM% > %ENV_FILE%
-  echo REM set JAVA=%JAVA% >> %ENV_FILE%
-  echo REM set JAVA_OPTS=%JAVA_OPTS% >> %ENV_FILE%
-  echo. >> %ENV_FILE%
+  echo REM set MAX_MEM=%MAX_MEM% > "%ENV_FILE%"
+  echo REM set JAVA=%JAVA% >> "%ENV_FILE%"
+  echo REM set JAVA_OPTS=%JAVA_OPTS% >> "%ENV_FILE%"
+  echo. >> "%ENV_FILE%"
 )
 
 start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%
diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi
index eeb3272..1e5f7d3 100644
--- a/packaging/Windows/ATCS_Installer.nsi
+++ b/packaging/Windows/ATCS_Installer.nsi
@@ -58,26 +58,26 @@ Section install
   Call GetJRE
   Pop $R0
   FileOpen $9 "ATCS.cmd" w
-  FileWrite $9 '@echo off'
-  FileWrite $9 ''
-  FileWrite $9 'set ATCS_DIR=%~dp0'
-  FileWrite $9 'set MAX_MEM=512M'
-  FileWrite $9 'set CP=%ATCS_DIR%lib\*'
-  FileWrite $9 'set JAVA=$R0'
-  FileWrite $9 'set JAVA_OPTS='
-  FileWrite $9 'set ENV_FILE=%ATCS_DIR%ATCS.env.bat'
-  FileWrite $9 'set MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio'
-  FileWrite $9 ''
-  FileWrite $9 'if exist %ENV_FILE% (' 
-  FileWrite $9 '  call %ENV_FILE%'
-  FileWrite $9 ') else ('
-  FileWrite $9 '  echo REM set MAX_MEM=%MAX_MEM% > %ENV_FILE%'
-  FileWrite $9 '  echo REM set JAVA=%JAVA% >> %ENV_FILE%'
-  FileWrite $9 '  echo REM set JAVA_OPTS=%JAVA_OPTS% >> %ENV_FILE%'
-  FileWrite $9 '  echo. >> %ENV_FILE%'
-  FileWrite $9 ')'
-  FileWrite $9 ''
-  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%'
+  FileWrite $9 '@echo off$\r$\n'
+  FileWrite $9 '$\r$\n'
+  FileWrite $9 'set ATCS_DIR=%~dp0$\r$\n'
+  FileWrite $9 'set MAX_MEM=512M$\r$\n'
+  FileWrite $9 'set CP=%ATCS_DIR%lib\*$\r$\n'
+  FileWrite $9 'set JAVA=$R0$\r$\n'
+  FileWrite $9 'set JAVA_OPTS=$\r$\n'
+  FileWrite $9 'set ENV_FILE=%ATCS_DIR%ATCS.env.bat$\r$\n'
+  FileWrite $9 'set MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio$\r$\n'
+  FileWrite $9 '$\r$\n'
+  FileWrite $9 'if exist "%ENV_FILE%" ($\r$\n' 
+  FileWrite $9 '  call "%ENV_FILE%"$\r$\n'
+  FileWrite $9 ') else ($\r$\n'
+  FileWrite $9 '  echo REM set MAX_MEM=%MAX_MEM% > "%ENV_FILE%"$\r$\n'
+  FileWrite $9 '  echo REM set JAVA=%JAVA% >> "%ENV_FILE%"$\r$\n'
+  FileWrite $9 '  echo REM set JAVA_OPTS=%JAVA_OPTS% >> "%ENV_FILE%"$\r$\n'
+  FileWrite $9 '  echo. >> "%ENV_FILE%"$\r$\n'
+  FileWrite $9 ')$\r$\n'
+  FileWrite $9 '$\r$\n'
+  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%$\r$\n'
   FileClose $9
   
   SetOutPath "$INSTDIR\lib\"