diff options
Diffstat (limited to 'scripts/rvi_install.sh')
| -rwxr-xr-x | scripts/rvi_install.sh | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/scripts/rvi_install.sh b/scripts/rvi_install.sh index bde3180..4fccf54 100755 --- a/scripts/rvi_install.sh +++ b/scripts/rvi_install.sh @@ -16,11 +16,10 @@ SELF_DIR=$(dirname $(readlink -f "$0")) SETUP_GEN=$SELF_DIR/setup_gen # Ulf's kitchen sink setup utility usage() { - echo "Usage: $0 binary_dir library_dir runtime_dir log_dir [prefix_strip]" + echo "Usage: $0 binary_dir library_dir log_dir [prefix_strip]" echo echo "RVI binaries will be installed in 'binary_dir'." echo "RVI libraries will be installed in 'library_dir'." - echo "RVI runtime files will be installed in 'runtime_dir'." echo "RVI logging will be done in 'log_dir'." echo echo "If 'prefix_strip' is provided, that part of the directories above" @@ -33,8 +32,8 @@ usage() { echo "Useful in build systems where packages are built up" echo "in subdirectories." echo - echo "The created node can be started with: 'binary_dir'/rvi" - echo "RVI in 'library_dir' will rely on a separate erlang install" + echo "The created node can be started with: 'binary_dir'/rvi_ctl" + echo "The RVI installation will rely on a separate erlang install" echo "to run." exit 1 } @@ -43,7 +42,7 @@ usage() { shift $((${OPTIND}-1)) -if [ "${#}" != "4" -a "${#}" != "5" ] +if [ "${#}" != "3" -a "${#}" != "4" ] then echo "Wrong number of arguments." usage @@ -51,12 +50,11 @@ fi BIN_DIR=$1 LIB_DIR=$2 -RUN_DIR=$3 -LOG_DIR=$4 +LOG_DIR=$3 -if [ "${#}" = "5" ] +if [ "${#}" = "4" ] then - PREFIX_STRIP=$5 + PREFIX_STRIP=$4 fi rm -rf ${LIB_DIR} ${BIN_DIR} > /dev/null 2>&1 @@ -64,7 +62,6 @@ rm -rf ${LIB_DIR} ${BIN_DIR} > /dev/null 2>&1 install --mode=0755 -d ${BIN_DIR} install --mode=0755 -d ${LIB_DIR} install --mode=0755 -d ${LOG_DIR} -install --mode=0755 -d ${RUN_DIR} FILE_SET=$(find ebin components deps -name ebin -o -name priv) @@ -75,18 +72,15 @@ if [ -s "${PREFIX_STRIP}" ] then STRIP_BIN_DIR=$(echo ${BIN_DIR} | sed "s|^${PREFIX_STRIP}||") STRIP_LIB_DIR=$(echo ${LIB_DIR} | sed "s|^${PREFIX_STRIP}||") - STRIP_RUN_DIR=$(echo ${RUN_DIR} | sed "s|^${PREFIX_STRIP}||") STRIP_LOG_DIR=$(echo ${LOG_DIR} | sed "s|^${PREFIX_STRIP}||") else STRIP_BIN_DIR=${BIN_DIR} STRIP_LIB_DIR=${LIB_DIR} - STRIP_RUN_DIR=${RUN_DIR} STRIP_LOG_DIR=${LOG_DIR} fi sed -e "s|__RVI_LIBDIR__|${STRIP_LIB_DIR}|g" \ -e "s|__RVI_BINDIR__|${STRIP_BIN_DIR}|g" \ - -e "s|__RVI_RUNDIR__|${STRIP_RUN_DIR}|g" \ -e "s|__RVI_LOGDIR__|${STRIP_LOG_DIR}|g" < scripts/rvi_ctl > /tmp/rvi_ctl install --mode=0755 /tmp/rvi_ctl ${BIN_DIR} @@ -95,7 +89,6 @@ install --mode=0755 rel/files/nodetool ${BIN_DIR} echo "RVI binary files installed under ${BIN_DIR}" echo "RVI library files installed under ${LIB_DIR}" -echo "RVI runtime files installed under ${RUN_DIR}" echo "RVI log files installed under ${LOG_DIR}" echo echo "Start: ${BIN_DIR}/rvi_ctl -c <config_file> start" |