Просмотр исходного кода

Merge pull request #7867 from zhongwencool/whitespace-in-install-path

fix: can't get emqx's priv_dir when whitespace in install path
zhongwencool 3 лет назад
Родитель
Сommit
28b7021322
3 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      apps/emqx/etc/emqx_cloud/vm.args
  2. 1 1
      apps/emqx/etc/emqx_edge/vm.args
  3. 2 2
      bin/emqx

+ 1 - 1
apps/emqx/etc/emqx_cloud/vm.args

@@ -120,7 +120,7 @@
 -shutdown_time 30000
 
 ## patches dir
--pa {{ platform_data_dir }}/patches
+-pa "{{ platform_data_dir }}/patches"
 
 ## Mnesia thresholds
 -mnesia dump_log_write_threshold 5000

+ 1 - 1
apps/emqx/etc/emqx_edge/vm.args

@@ -118,7 +118,7 @@
 -shutdown_time 10000
 
 ## patches dir
--pa {{ platform_data_dir }}/patches
+-pa "{{ platform_data_dir }}/patches"
 
 ## Mnesia thresholds
 -mnesia dump_log_write_threshold 5000

+ 2 - 2
bin/emqx

@@ -289,7 +289,7 @@ compatiblity_info() {
     -eval "$COMPATIBILITY_CHECK"
 }
 
-# Collect Eralng/OTP runtime sanity and compatibility in one go
+# Collect Erlang/OTP runtime sanity and compatibility in one go
 if [ "$IS_BOOT_COMMAND" = 'yes' ]; then
     # Read BUILD_INFO early as the next commands may mess up the shell
     BUILD_INFO="$(cat "${REL_DIR}/BUILD_INFO")"
@@ -514,7 +514,7 @@ generate_config() {
     TMP_ARG_FILE="$CONFIGS_DIR/vm.args.tmp"
     cp "$EMQX_ETC_DIR/vm.args" "$TMP_ARG_FILE"
     echo "" >> "$TMP_ARG_FILE"
-    echo "-pa ${REL_DIR}/consolidated" >> "$TMP_ARG_FILE"
+    echo "-pa \"${REL_DIR}/consolidated\"" >> "$TMP_ARG_FILE"
     ## read lines from generated vm.<time>.args file
     ## drop comment lines, and empty lines using sed
     ## pipe the lines to a while loop