relocatable release errata

basho · Dec 28, 2021 · 4427547 · 4427547
1 parent e92c09a
commit 4427547
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/rel/files/riak-admin b/rel/files/riak-admin
@@ -919,7 +919,7 @@ case "$1" in
                        -eval "riak_kv_backup:$ACTION('$NODE', \"$FILENAME\", \"$TYPE\")" -s init stop
         ;;
 
-    test)
+    'test')
         # Make sure the local node IS running
 
         shift
@@ -962,7 +962,7 @@ case "$1" in
         RAND=$(($(($$ % 1000)) + 1))
         # Using np_etop instead of riak_etop to follow node_package convention
         $ERTS_PATH/erl -noshell -noinput \
-            -pa {{platform_base_dir}} \
+            -pa {{platform_patch_dir}} \
             -boot $BOOT_FILE \
             -hidden -name np_etop$RAND@$HOST -setcookie $COOKIE \
             -s etop -s erlang halt -output text \

diff --git a/rel/vars.config b/rel/vars.config
@@ -5,13 +5,13 @@
 
 %% Platform-specific installation paths
 {platform_base_dir,  "${RIAK_PATH:-$RELEASE_ROOT_DIR}"}.
-{platform_bin_dir,   "{{platform_base_dir}}/bin"}.
-{platform_data_dir,  "{{platform_base_dir}}/data"}.
-{platform_etc_dir,   "{{platform_base_dir}}/etc"}.
-{platform_lib_dir,   "{{platform_base_dir}}/lib"}.
-{platform_log_dir,   "{{platform_base_dir}}/log"}.
-{platform_gen_dir,   "{{platform_base_dir}}/releases/{{release_version}}"}.
-{platform_patch_dir, "{{platform_lib_dir}}/patches"}.
+{platform_bin_dir,   "./bin"}.
+{platform_data_dir,  "./data"}.
+{platform_etc_dir,   "./etc"}.
+{platform_lib_dir,   "./lib"}.
+{platform_log_dir,   "./log"}.
+{platform_gen_dir,   "./releases/{{release_version}}"}.
+{platform_patch_dir, "./patches"}.
 
 %%
 %% etc/app.config