diff options
| author | Jan Lehnardt <jan@apache.org> | 2020-01-08 23:11:40 +0100 |
|---|---|---|
| committer | Joan Touzet <wohali@users.noreply.github.com> | 2020-01-08 17:11:40 -0500 |
| commit | 8e896884f09bbcbe60de5898424032451f59da74 (patch) | |
| tree | 6be051526ade5713f755dba1e78f85b9d73c8597 | |
| parent | c4d4590dee9e30807445dda8e3ac157bef3c37d9 (diff) | |
| download | couchdb-8e896884f09bbcbe60de5898424032451f59da74.tar.gz | |
fix(#2143): allow env var overrides for js query server config (#2393)
* fix(#2143): allow env var overrides for js query server config
* Remove incorrect quotation marks from couchdb.cmd.in
Co-authored-by: Joan Touzet <wohali@apache.org>
| -rw-r--r-- | rel/files/couchdb.cmd.in | 6 | ||||
| -rwxr-xr-x | rel/files/couchdb.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rel/files/couchdb.cmd.in b/rel/files/couchdb.cmd.in index 05096886f..2504f8c60 100644 --- a/rel/files/couchdb.cmd.in +++ b/rel/files/couchdb.cmd.in @@ -25,9 +25,9 @@ set EMU=beam set PROGNAME=%~n0 set PATH=%PATH%;%COUCHDB_BIN_DIR% -set COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js" -set COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js" -set COUCHDB_FAUXTON_DOCROOT="{{fauxton_root}}" +IF NOT DEFINED COUCHDB_QUERY_SERVER_JAVASCRIPT SET COUCHDB_QUERY_SERVER_JAVASCRIPT={{prefix}}/bin/couchjs {{prefix}}/share/server/main.js +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" ^ -args_file "%ROOTDIR%\etc\vm.args" ^ diff --git a/rel/files/couchdb.in b/rel/files/couchdb.in index f64c0f860..7ded42d0f 100755 --- a/rel/files/couchdb.in +++ b/rel/files/couchdb.in @@ -36,8 +36,8 @@ export BINDIR="$ROOTDIR/erts-$ERTS_VSN/bin" export EMU=beam export PROGNAME=`echo $0 | sed 's/.*\///'` -export COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js" -export COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js" +export COUCHDB_QUERY_SERVER_JAVASCRIPT="${COUCHDB_QUERY_SERVER_JAVASCRIPT:-{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js" +export COUCHDB_QUERY_SERVER_COFFEESCRIPT="${COUCHDB_QUERY_SERVER_COFFEESCRIPT:-{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js" export COUCHDB_FAUXTON_DOCROOT={{fauxton_root}} ARGS_FILE="${COUCHDB_ARGS_FILE:-$ROOTDIR/etc/vm.args}" |