another go at making make rel relocatable again

Author: Andrei Zavada

rel/files/riak

@@ -53,12 +53,12 @@ function maybe_su {
 
 case "$1" in
     start)
-        maybe_su $RELX_RIAK $* -pa {{runner_patch_dir}} \
+        maybe_su $RELX_RIAK $* -pa {{platform_patch_dir}} \
             && write_pid_file
 	test -r $PID_DIR/riak.pid && exit 0
 	;;
     console|foreground)
-        maybe_su $RELX_RIAK $* -pa {{runner_patch_dir}}
+        maybe_su $RELX_RIAK $* -pa {{platform_patch_dir}}
 	;;
     stop)
         maybe_su $RELX_RIAK $* \

rel/files/riak-admin

@@ -5,15 +5,17 @@
 # Identify the script name
 SCRIPT="riak-admin"
 
-RPC_HOP="{{platform_bin_dir}}/riak rpc"
-RPCt_HOP="{{platform_bin_dir}}/riak rpcterms"
+PLATFORM_BASE_DIR=${PLATFORM_BASE_DIR:-$(cd $(dirname "$0")/.. && pwd -P)}
+RPC_HOP="${PLATFORM_BASE_DIR}/bin/riak rpc"
+RPCt_HOP="${PLATFORM_BASE_DIR}/bin/riak rpcterms"
 
-ERTS_PATH="{{platform_base_dir}}/`(cd {{platform_base_dir}} && ls -d erts-*)`/bin"
-COOKIE=`egrep '^[ \t]*distributed_cookie[ \t]*=[ \t]*' {{platform_etc_dir}}/riak.conf 2> /dev/null | cut -d = -f 2 | tr -d ' '`
+ERTS_VER=$(cd ${PLATFORM_BASE_DIR} && ls -d erts-*)
+ERTS_PATH="${PLATFORM_BASE_DIR}/$ERTS_VER/bin"
+COOKIE=`egrep '^[ \t]*distributed_cookie[ \t]*=[ \t]*' ${PLATFORM_BASE_DIR}/etc/riak.conf 2> /dev/null | cut -d = -f 2 | tr -d ' '`
 NODE={{node}}
 HOST=${NODE#*@}
 
-BOOT_FILE="{{runner_base_dir}}/releases/{{release_version}}/start_clean"
+BOOT_FILE="${PLATFORM_BASE_DIR}/releases/{{release_version}}/start_clean"
 
 usage() {
     echo "Usage: $SCRIPT { cluster | join | leave | backup | restore | test | "
@@ -871,7 +873,7 @@ case "$1" in
         OLDNODE=$1
         NEWNODE=$2
         $ERTS_PATH/erl -noshell \
-            -pa {{runner_patch_dir}} \
+            -pa {{platform_patch_dir}} \
             -boot $BOOT_FILE \
             $CONFIG_ARGS \
             -eval "riak_kv_console:$ACTION(['$OLDNODE', '$NEWNODE'])" \
@@ -892,7 +894,7 @@ case "$1" in
         FILENAME=$3
 
         $ERTS_PATH/erl -noshell -name riak_kv_backup@$HOST -setcookie $COOKIE \
-                       -pa {{runner_patch_dir}} \
+                       -pa {{platform_patch_dir}} \
                        -boot $BOOT_FILE \
                        -eval "riak_kv_backup:$ACTION('$NODE', \"$FILENAME\")" -s init stop
         ;;
@@ -912,7 +914,7 @@ case "$1" in
         TYPE=$4
 
         $ERTS_PATH/erl -noshell -name riak_kv_backup@$HOST -setcookie $COOKIE \
-                       -pa {{runner_patch_dir}} \
+                       -pa {{platform_patch_dir}} \
                        -boot $BOOT_FILE \
                        -eval "riak_kv_backup:$ACTION('$NODE', \"$FILENAME\", \"$TYPE\")" -s init stop
         ;;
@@ -925,7 +927,7 @@ case "$1" in
         # Parse out the node name to pass to the client
 
         $ERTS_PATH/erl -noshell -name riak_test@$HOST -setcookie $COOKIE \
-                       -pa {{runner_patch_dir}} \
+                       -pa {{platform_patch_dir}} \
                        -boot $BOOT_FILE \
                        -eval "case catch(riak:client_test(\"$NODE\")) of \
                                ok -> init:stop();                             \
@@ -960,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 {{runner_base_dir}} \
+            -pa {{platform_base_dir}} \
             -boot $BOOT_FILE \
             -hidden -name np_etop$RAND@$HOST -setcookie $COOKIE \
             -s etop -s erlang halt -output text \

rel/files/riak-chkconfig

@@ -2,15 +2,18 @@
 # -*- tab-width:4;indent-tabs-mode:nil -*-
 # ex: ts=4 sw=4 et
 
-ERTS_PATH="{{runner_base_dir}}/`(cd {{runner_base_dir}} && ls -d erts-*)`/bin"
-COOKIE=`egrep '^[ \t]*distributed_cookie[ \t]*=[ \t]*' {{platform_etc_dir}}/riak.conf 2> /dev/null | cut -d = -f 2 | tr -d ' '`
+PLATFORM_BASE_DIR=${RCS_PATH:-$(cd $(dirname "$0")/.. && pwd -P)}
+
+ERTS_VER=$(cd ${PLATFORM_BASE_DIR} && ls -d erts-*)
+ERTS_PATH="${PLATFORM_BASE_DIR}/$ERTS_VER/bin"
+COOKIE=`egrep '^[ \t]*distributed_cookie[ \t]*=[ \t]*' ${PLATFORM_BASE_DIR}/etc/riak.conf 2> /dev/null | cut -d = -f 2 | tr -d ' '`
 NODE={{node}}
 HOST=${NODE#*@}
 
-BOOT_FILE="{{runner_base_dir}}/releases/{{release_version}}/start_clean"
+BOOT_FILE="${PLATFORM_BASE_DIR}/releases/{{release_version}}/start_clean"
 
-CONFIG_PATH=`ls -1r {{platform_gen_dir}}/generated.conf/app.*.config | head -n1`
-VMARGS_PATH=`ls -1r {{platform_gen_dir}}/generated.conf/vm.*.args | head -n1`
+CONFIG_PATH=`ls -1r ${PLATFORM_BASE_DIR}/releases/{{release_version}}/generated.conf/app.*.config | head -n1`
+VMARGS_PATH=`ls -1r ${PLATFORM_BASE_DIR}/releases/{{release_version}}/generated.conf/vm.*.args | head -n1`
 
 CODE=" try
            {ok, _} = file:consult(\"$CONFIG_PATH\"),

rel/files/riak-debug

@@ -135,9 +135,11 @@ exit
 ###
 
 # These paths may be overridden with environment variables.
+PLATFORM_BASE_DIR=${PLATFORM_LIB_DIR:-$(cd $(dirname "$0")/.. && pwd -P)}
+
 RUNNER_BASE_DIR=$(cd `dirname $0` && /bin/pwd -P)/..
 riak_base_dir=$RUNNER_BASE_DIR
-riak_bin_dir={{platform_script_dir}}
+riak_bin_dir={{platform_bin_dir}}
 riak_etc_dir={{platform_etc_dir}}
 riak_sbin_dir=/usr/sbin
 

rel/files/riak-repl

@@ -5,7 +5,9 @@
 # Identify the script name
 SCRIPT=`basename $0`
 
-RPC_HOP="{{platform_bin_dir}}/riak rpc"
+PLATFORM_BASE_DIR=${RCS_PATH:-$(cd $(dirname "$0")/.. && pwd -P)}
+
+RPC_HOP="${PLATFORM_BASE_DIR}/bin/riak rpc"
 
 V2REPLDEP="DEPRECATION NOTICE: The replication protocol you are currently using in this cluster has been deprecated and will be unsupported and removed some time after the Riak Enterprise 2.1 release. Please upgrade to the latest replication protocol as soon as possible. If you need assistance migrating contact Basho Client Services or follow the instructions in our documentation ( http://docs.basho.com/riakee/latest/cookbooks/Multi-Data-Center-Replication-UpgradeV2toV3/ )."
 

rel/vars.config

@@ -4,13 +4,14 @@
 {rel_vsn, "{{release_version}}"}.
 
 %% Platform-specific installation paths
-{platform_base_dir, "${RIAK_PATH:-/opt/riak}"}.
-{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_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"}.
 
 %%
 %% etc/app.config
@@ -40,16 +41,11 @@
 %%
 %% bin/riak
 %%
-{runner_script_dir,  "{{platform_bin_dir}}"}.
-{runner_base_dir,    "{{platform_base_dir}}"}.
-{runner_etc_dir,     "{{platform_etc_dir}}"}.
-{runner_log_dir,     "{{platform_log_dir}}"}.
-{runner_lib_dir,     "{{platform_lib_dir}}"}.
-{runner_patch_dir,   "{{platform_lib_dir}}/patches"}.
-{pipe_dir,           "{{platform_base_dir}}/tmp/riak"}.
-{pid_dir,            "{{platform_base_dir}}/var/run/riak"}.
-{runner_wait_process, "riak_core_node_watcher"}.
-{runner_ulimit_warn, 65536}.
+
+%% relocatable releases don't call the launcher script, because
+%% launcher script requires a riak user to exist.
+%%{pipe_dir,           "$PLATFORM_BASE_DIR/tmp/riak"}.
+%%{pid_dir,            "$PLATFORM_BASE_DIR/var/run/riak"}.
 
 %%
 %% cuttlefish