rely on RIAK_PATH in scripts generated with make rel

Avoid backticks in platform_base_dir as this runs afoul of backtick
substitutions down the line in scripts. Instead, read the value for
platform_base_dir from RIAK_PATH (/opt/riak by default).

This change only affects `make rel`; specifically, if you want to run
./rel/riak/bin/riak-admin right from the source tree, you will have to
set RIAK_PATH to `pwd`/rel/riak first.

Author: hmmr

Makefile

@@ -76,15 +76,15 @@ test : testclean eunit test-deps
 rel: compile
 	@$(REBAR) as rel release
 # freebsd tar won't write to stdout, so
-	@tar  -c -f rel.tar --exclude '*/.git/*' -C _build/rel/rel riak && tar -x -f rel.tar -C rel && rm rel.tar
+	@tar -c -f rel.tar --exclude-vcs -C _build/rel/rel riak && tar -x -f rel.tar -C rel && rm rel.tar
 
 rel-rpm: compile
 	@$(REBAR) as rpm release
-	@tar --exclude='*/.git/*' -c -C _build/rpm/rel riak | tar -x -C rel
+	@tar --exclude-vcs -c -C _build/rpm/rel riak | tar -x -C rel
 
 rel-deb: compile
 	@$(REBAR) as deb release
-	@tar --exclude='*/.git/*' -c -C _build/deb/rel riak | tar -x -C rel
+	@tar --exclude=vcs -c -C _build/deb/rel riak | tar -x -C rel
 
 relclean:
 	@rm -rf $(REL_DIR)

rel/files/riak-admin

@@ -7,7 +7,7 @@ SCRIPT="riak-admin"
 
 RPC_HOP="{{platform_bin_dir}}/riak rpc"
 
-ERTS_PATH="{{runner_base_dir}}/`(cd {{runner_base_dir}} && ls -d erts-*)`/bin"
+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 ' '`
 NODE={{node}}
 HOST=${NODE#*@}

rel/files/riak-debug

@@ -136,10 +136,10 @@ exit
 ###
 
 # These paths may be overridden with environment variables.
-RUNNER_BASE_DIR={{runner_base_dir}}
-riak_base_dir={{runner_base_dir}}
-riak_bin_dir={{runner_script_dir}}
-riak_etc_dir={{runner_etc_dir}}
+RUNNER_BASE_DIR=$(cd `dirname $0` && /bin/pwd -P)/..
+riak_base_dir=$RUNNER_BASE_DIR
+riak_bin_dir={{platform_script_dir}}
+riak_etc_dir={{platform_etc_dir}}
 riak_sbin_dir=/usr/sbin
 
 get_cfgs=0

rel/vars.config

@@ -4,12 +4,13 @@
 {rel_vsn, "{{release_version}}"}.
 
 %% Platform-specific installation paths
-{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_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}}"}.
 
 %%
 %% etc/app.config