[ZEPPELIN-13] ZEPPELIN_CONF_DIR cannot be reached until ZEPPELIN_CONF_DIR become set

- Fix the orders of checking configuration between zeppelin-daemon.sh and zeppelin.sh
This commit is contained in:
Jongyoul Lee 2015-04-01 10:48:40 +09:00
parent a61d28a58a
commit 649075590a

View file

@ -28,13 +28,6 @@ if [ $# -le 1 ]; then
exit 1
fi
if [ -L ${BASH_SOURCE-$0} ]; then
BIN=$(dirname $(readlink "${BASH_SOURCE-$0}"))
else
BIN=$(dirname ${BASH_SOURCE-$0})
fi
BIN=$(cd "${BIN}">/dev/null; pwd)
if [ "$1" == "--config" ]
then
shift
@ -50,6 +43,12 @@ then
shift
fi
if [ -L ${BASH_SOURCE-$0} ]; then
BIN=$(dirname $(readlink "${BASH_SOURCE-$0}"))
else
BIN=$(dirname ${BASH_SOURCE-$0})
fi
BIN=$(cd "${BIN}">/dev/null; pwd)
. "${BIN}/common.sh"
. "${BIN}/functions.sh"