Merge pull request #684 from tolbrino/pr-win32-origfile

[UPDATED] Fix renaming of .orig configuration files on Windows

2 files changed, 31 insertions, 1 deletions

diff --git a/priv/templates/bin_windows b/priv/templates/bin_windows
index b3ce796..19c0d2d 100644
--- a/priv/templates/bin_windows
+++ b/priv/templates/bin_windows
@@ -73,6 +73,23 @@ cd %rootdir%
 @set "possible_sys=%rel_dir%\sys.config"
 @if exist "%possible_sys%" (
   set sys_config=-config "%possible_sys%"
+) else (
+  @if exist "%possible_sys%.orig" (
+    ren "%possible_sys%.orig" sys.config
+    set sys_config=-config "%possible_sys%"
+  )
+)
+
+:: Find the vm.args file
+:find_vm_args
+@set "possible_vm_args=%rel_dir%\vm.args"
+@if exist "%possible_vm_args%" (
+  set vm_args="%possible_vm_args%"
+) else (
+  @if exist "%possible_vm_args%.orig" (
+    ren "%possible_vm_args%.orig" vm.args
+    set vm_args="%possible_vm_args%"
+  )
 )
 @goto :eof
 
diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows
index 045a80c..ec70c47 100644
--- a/priv/templates/extended_bin_windows
+++ b/priv/templates/extended_bin_windows
@@ -148,8 +148,21 @@
 :: Find the sys.config file
 :find_sys_config
 @set "possible_sys=%rel_dir%\sys.config"
-@if exist %possible_sys% (
+@if exist "%possible_sys%" (
   set sys_config=-config "%possible_sys%"
+) else (
+  @if exist "%possible_sys%.orig" (
+    ren "%possible_sys%.orig" sys.config
+    set sys_config=-config "%possible_sys%"
+  )
+)
+
+:: Find the vm.args file
+:find_vm_args
+@if not exist "%m_args%" (
+  @if exist "%m_args%.orig" (
+    ren "%m_args%.orig" vm.args
+  )
 )
 @goto :eof