Skip to content

Commit

Permalink
Simplify couchdb.cmd.in and remove app version (#5100)
Browse files Browse the repository at this point in the history
After removing the version number from `start_erl.data` and updating the startup script in [1], we forgot to update the Windows startup script. Let's make up for this now.

[1] #5085
  • Loading branch information
big-r81 authored Jun 22, 2024
1 parent f1fc2f0 commit ea3e05f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions rel/files/couchdb.cmd.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ CD "%ROOTDIR%"

SET /P START_ERL= < releases\start_erl.data
FOR /F "tokens=1" %%G IN ("%START_ERL%") DO SET ERTS_VSN=%%G
FOR /F "tokens=2" %%G IN ("%START_ERL%") DO SET APP_VSN=%%G

set BINDIR=%ROOTDIR%/erts-%ERTS_VSN%/bin
set EMU=beam
Expand All @@ -29,9 +28,9 @@ IF NOT DEFINED COUCHDB_QUERY_SERVER_JAVASCRIPT SET COUCHDB_QUERY_SERVER_JAVASCRI
IF NOT DEFINED COUCHDB_QUERY_SERVER_COFFEESCRIPT SET COUCHDB_QUERY_SERVER_COFFEESCRIPT={{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
IF NOT DEFINED COUCHDB_FAUXTON_DOCROOT SET COUCHDB_FAUXTON_DOCROOT={{fauxton_root}}

"%BINDIR%\erl" -boot "%ROOTDIR%\releases\%APP_VSN%\couchdb" ^
"%BINDIR%\erl" -boot "%ROOTDIR%\releases\couchdb" ^
-args_file "%ROOTDIR%\etc\vm.args" ^
-epmd "%BINDIR%\epmd.exe" ^
-config "%ROOTDIR%\releases\%APP_VSN%\sys.config" %*
-config "%ROOTDIR%\releases\sys.config" %*

:: EXIT /B

0 comments on commit ea3e05f

Please sign in to comment.