fix bin paths in riak-debug

Author: Andrei Zavada

rel/files/riak-debug

@@ -135,13 +135,13 @@ 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_PATH="${RIAK_PATH:-$(cd $(dirname "$0")/.. && pwd -P)}"
+riak_base_dir={{platform_base_dir}}
 riak_bin_dir={{platform_bin_dir}}
 riak_etc_dir={{platform_etc_dir}}
-riak_sbin_dir=/usr/sbin
+riak_log_dir={{platform_log_dir}}
+riak_lib_dir={{platform_lib_dir}}
+riak_gen_dir={{platform_gen_dir}}
 
 get_cfgs=0
 get_ssl_certs=0
@@ -481,23 +481,23 @@ if [ 1 -eq $get_riakcmds ]; then
     # commands on Riak<=1.2.0 and should not be executed in a loop against all
     # nodes in a cluster.
 
-    dump riak_ping "$riak_sbin_dir"/riak ping
-    # dump riak_version "$riak_sbin_dir"/riak admin version
-    dump riak_member_status "$riak_sbin_dir"/riak admin member-status
-    dump riak_ring_status "$riak_sbin_dir"/riak admin ring-status
-    dump riak_status "$riak_sbin_dir"/riak admin status
-    dump riak_transfers "$riak_sbin_dir"/riak admin transfers
-    dump riak_diag "$riak_sbin_dir"/riak admin diag
-    dump riak_repl_status "$riak_sbin_dir"/riak repl status
-    dump riak_repl_connections "$riak_sbin_dir"/riak repl connections
-    dump riak_repl_clusterstats "$riak_sbin_dir"/riak repl clusterstats
-    dump riak_repl_modes "$riak_sbin_dir"/riak repl modes
+    dump riak_ping "$riak_bin_dir"/riak ping
+    dump riak_version "$riak_bin_dir"/riak versions
+    dump riak_member_status "$riak_bin_dir"/riak-admin member-status
+    dump riak_ring_status "$riak_bin_dir"/riak-admin ring-status
+    dump riak_status "$riak_bin_dir"/riak-admin status
+    dump riak_transfers "$riak_bin_dir"/riak-admin transfers
+    dump riak_diag "$riak_bin_dir"/riak-admin diag
+    dump riak_repl_status "$riak_bin_dir"/riak-repl status
+    dump riak_repl_connections "$riak_bin_dir"/riak-repl connections
+    dump riak_repl_clusterstats "$riak_bin_dir"/riak-repl clusterstats
+    dump riak_repl_modes "$riak_bin_dir"/riak-repl modes
 
     # If Yokozuna is not installed, $yz_test will be null.
     yz_test="`epath 'yokozuna root_dir' "$riak_epaths" | sed -e 's/^\"//' -e 's/\".*$//'`"
     # Only execute the search aae_statis command if $yz_test is not null.
     if [ -n "$yz_test" ]; then
-        dump riak_search_aae_status "$riak_sbin_dir"/riak admin search aae-status
+        dump riak_search_aae_status "$riak_bin_dir"/riak-admin search aae-status
     fi
 
     # Get one http listener (epath might output a newline-separated list).
@@ -604,7 +604,7 @@ fi
 if [ 1 -eq $get_extracmds ]; then
     mkdir_or_die "${start_dir}"/"${debug_dir}"/commands/.info
     cd "${start_dir}"/"${debug_dir}"/commands
-    dump riak_vnode_status "$riak_sbin_dir"/riak admin vnode-status
+    dump riak_vnode_status "$riak_bin_dir"/riak-admin vnode-status
 fi
 
 ###