aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTino Breddin <[email protected]>2019-01-31 09:37:07 +0100
committerTino Breddin <[email protected]>2019-02-08 10:00:24 +0100
commit50c50a5cc4727ed6a982e27fafff8568b5e83d39 (patch)
treeb66d4f2d69a168d76d26e36cf9a8f771d319265a
parent7fa443af83c26663ad569dda99a0ce4925e17477 (diff)
downloadrelx-50c50a5cc4727ed6a982e27fafff8568b5e83d39.tar.gz
relx-50c50a5cc4727ed6a982e27fafff8568b5e83d39.tar.bz2
relx-50c50a5cc4727ed6a982e27fafff8568b5e83d39.zip
Add sys.config and vm.args check to extended win32 bin
-rw-r--r--priv/templates/extended_bin_windows20
1 files changed, 13 insertions, 7 deletions
diff --git a/priv/templates/extended_bin_windows b/priv/templates/extended_bin_windows
index 694c5c7..ec70c47 100644
--- a/priv/templates/extended_bin_windows
+++ b/priv/templates/extended_bin_windows
@@ -148,15 +148,21 @@
:: Find the sys.config file
:find_sys_config
@set "possible_sys=%rel_dir%\sys.config"
-@if exist %possible_sys% (
- set sys_config=-config "%possible_sys%"
-)
-@if exist "%possible_sys%.orig" (
- ren "%possible_sys%.orig" 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%"
+ )
)
-@if exist "%rel_dir%\vm.args.orig" (
- ren "%rel_dir%\vm.args.orig" vm.args
+
+:: 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