yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(bin/emqx): no need to template-render RUNNER_ROOT_DIR

This commit is contained in:
Zaiming (Stone) Shi 2022-04-13 13:14:58 +02:00
parent c62f7e5baa
commit c8242816b0
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/emqx
View File

@ -9,9 +9,9 @@ if [ "$DEBUG" -eq 1 ]; then
set -x set -x
fi fi
ROOT_DIR="$(cd "$(dirname "$(readlink "$0" || echo "$0")")"/..; pwd -P)" RUNNER_ROOT_DIR="$(cd "$(dirname "$(readlink "$0" || echo "$0")")"/..; pwd -P)"
# shellcheck disable=SC1090,SC1091 # shellcheck disable=SC1090,SC1091
. "$ROOT_DIR"/releases/emqx_vars . "$RUNNER_ROOT_DIR"/releases/emqx_vars
# defined in emqx_vars # defined in emqx_vars
export RUNNER_ROOT_DIR export RUNNER_ROOT_DIR

2
mix.exs
View File

@ -537,7 +537,6 @@ defmodule EMQXUmbrella.MixProject do
platform_lib_dir: "lib", platform_lib_dir: "lib",
platform_log_dir: "log", platform_log_dir: "log",
platform_plugins_dir: "plugins", platform_plugins_dir: "plugins",
runner_root_dir: "$(cd $(dirname $(readlink $0 || echo $0))/..; pwd -P)",
runner_bin_dir: "$RUNNER_ROOT_DIR/bin", runner_bin_dir: "$RUNNER_ROOT_DIR/bin",
emqx_etc_dir: "$RUNNER_ROOT_DIR/etc", emqx_etc_dir: "$RUNNER_ROOT_DIR/etc",
runner_lib_dir: "$RUNNER_ROOT_DIR/lib", runner_lib_dir: "$RUNNER_ROOT_DIR/lib",
@ -563,7 +562,6 @@ defmodule EMQXUmbrella.MixProject do
platform_lib_dir: "", platform_lib_dir: "",
platform_log_dir: "/var/log/emqx", platform_log_dir: "/var/log/emqx",
platform_plugins_dir: "/var/lib/emqx/plugins", platform_plugins_dir: "/var/lib/emqx/plugins",
runner_root_dir: "/usr/lib/emqx",
runner_bin_dir: "/usr/bin", runner_bin_dir: "/usr/bin",
emqx_etc_dir: "/etc/emqx", emqx_etc_dir: "/etc/emqx",
runner_lib_dir: "$RUNNER_ROOT_DIR/lib", runner_lib_dir: "$RUNNER_ROOT_DIR/lib",

2
rebar.config.erl
View File

@ -273,7 +273,6 @@ overlay_vars_pkg(bin) ->
, {platform_lib_dir, "lib"} , {platform_lib_dir, "lib"}
, {platform_log_dir, "log"} , {platform_log_dir, "log"}
, {platform_plugins_dir, "plugins"} , {platform_plugins_dir, "plugins"}
, {runner_root_dir, "$(cd $(dirname $(readlink $0 || echo $0))/..; pwd -P)"}
, {runner_bin_dir, "$RUNNER_ROOT_DIR/bin"} , {runner_bin_dir, "$RUNNER_ROOT_DIR/bin"}
, {emqx_etc_dir, "$RUNNER_ROOT_DIR/etc"} , {emqx_etc_dir, "$RUNNER_ROOT_DIR/etc"}
, {runner_lib_dir, "$RUNNER_ROOT_DIR/lib"} , {runner_lib_dir, "$RUNNER_ROOT_DIR/lib"}
@ -288,7 +287,6 @@ overlay_vars_pkg(pkg) ->
, {platform_lib_dir, ""} , {platform_lib_dir, ""}
, {platform_log_dir, "/var/log/emqx"} , {platform_log_dir, "/var/log/emqx"}
, {platform_plugins_dir, "/var/lib/emqx/plugins"} , {platform_plugins_dir, "/var/lib/emqx/plugins"}
, {runner_root_dir, "/usr/lib/emqx"}
, {runner_bin_dir, "/usr/bin"} , {runner_bin_dir, "/usr/bin"}
, {emqx_etc_dir, "/etc/emqx"} , {emqx_etc_dir, "/etc/emqx"}
, {runner_lib_dir, "$RUNNER_ROOT_DIR/lib"} , {runner_lib_dir, "$RUNNER_ROOT_DIR/lib"}

1
rel/emqx_vars
View File

@ -6,7 +6,6 @@
REL_VSN="{{ release_version }}" REL_VSN="{{ release_version }}"
ERTS_VSN="{{ erts_vsn }}" ERTS_VSN="{{ erts_vsn }}"
ERL_OPTS="{{ erl_opts }}" ERL_OPTS="{{ erl_opts }}"
RUNNER_ROOT_DIR="{{ runner_root_dir }}"
RUNNER_BIN_DIR="{{ runner_bin_dir }}" RUNNER_BIN_DIR="{{ runner_bin_dir }}"
RUNNER_LOG_DIR="{{ runner_log_dir }}" RUNNER_LOG_DIR="{{ runner_log_dir }}"
RUNNER_LIB_DIR="{{ runner_lib_dir }}" RUNNER_LIB_DIR="{{ runner_lib_dir }}"