Skip to content

Cosmetic change: Omit .config file extension from -config argument #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weiss wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Cosmetic change: Omit .config file extension from -config argument #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion priv/templates/bin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ IFS="$IFS_NORM"
# Build arguments for erlexec
set --
[ "$ERL_OPTS" ] && set -- "$@" "$ERL_OPTS"
[ "$SYS_CONFIG" ] && set -- "$@" -config "$SYS_CONFIG"
[ "$SYS_CONFIG" ] && set -- "$@" -config "${SYS_CONFIG%.config}"
[ "$VM_ARGS" ] && set -- "$@" -args_file "$VM_ARGS"
set -- "$@" -boot_var SYSTEM_LIB_DIR "$SYSTEM_LIB_DIR" -boot "$REL_DIR/$BOOTFILE"
{{! Split string with extra arguments back into an argument list. }}
Expand Down
2 changes: 1 addition & 1 deletion priv/templates/bin_windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ echo Rootdir=%converted_rootdir% >> "%erl_ini%"

:: Start the release in an `erl` shell
set boot=-boot "%boot_script%" -boot_var RELEASE_DIR "%release_root_dir%"
"%erl%" %erl_opts% %sys_config% %boot% %*
"%erl%" %erl_opts% %sys_config:.config=% %boot% %*

goto :eof

Expand Down
4 changes: 2 additions & 2 deletions priv/templates/extended_bin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ case "$1" in
echo "Exec: $BINDIR/erlexec" $FOREGROUNDOPTIONS \
-boot "$BOOTFILE" -mode "$CODE_LOADING_MODE" \
-boot_var SYSTEM_LIB_DIR "$SYSTEM_LIB_DIR" \
-config "$RELX_CONFIG_PATH" \
-config ${RELX_CONFIG_PATH%.config} \
-args_file "$VMARGS_PATH" \
$EXTRA_DIST_ARGS -- "$@"
echo "Root: $ROOTDIR"
Expand All @@ -1000,7 +1000,7 @@ case "$1" in
exec "$BINDIR/erlexec" $FOREGROUNDOPTIONS \
-boot "$BOOTFILE" -mode "$CODE_LOADING_MODE" \
-boot_var SYSTEM_LIB_DIR "$SYSTEM_LIB_DIR" \
-config "$RELX_CONFIG_PATH" \
-config ${RELX_CONFIG_PATH%.config} \
-args_file "$VMARGS_PATH" \
$EXTRA_DIST_ARGS -- "$@"
# exec will replace the current image and nothing else gets
Expand Down
2 changes: 1 addition & 1 deletion priv/templates/extended_bin_windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ goto :eof
:: Start a console
:console
set boot=-boot "%boot_script%" -boot_var RELEASE_DIR "%release_root_dir%"
start "%rel_name% console" %werl% %boot% %sys_config% ^
start "%rel_name% console" %werl% %boot% %sys_config:.config=% ^
-args_file "%vm_args%"
goto :eof

Expand Down
2 changes: 1 addition & 1 deletion priv/templates/psutil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function Find-FormatConfig()
}
}

return $out
return $out -replace '\.config$', ''
}

function Format-OSVars()
Expand Down