Skip to content

Commit

Permalink
Merge branch 'fix-bin-storm-style' of https://github.com/erikdw/storm
Browse files Browse the repository at this point in the history
…into fix-bin-storm-style
  • Loading branch information
HeartSaVioR committed Oct 6, 2015
2 parents 4c2b37c + 0a2843a commit 1822491
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions bin/storm
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,16 @@ STORM_BIN_DIR=`dirname ${PRG}`
export STORM_BASE_DIR=`cd ${STORM_BIN_DIR}/..;pwd`

#check to see if the conf dir is given as an optional argument
if [ $# -gt 1 ]
then
if [ "--config" = "$1" ]
then
conf_file=$2
if [ ! -f "$conf_file" ]; then
echo "Error: Cannot find configuration directory: $conf_file"
exit 1
fi
STORM_CONF_FILE=$conf_file
STORM_CONF_DIR=`dirname $conf_file`
if [ $# -gt 1 ]; then
if [ "--config" = "$1" ]; then
conf_file=$2
if [ ! -f "$conf_file" ]; then
echo "Error: Cannot find configuration directory: $conf_file"
exit 1
fi
STORM_CONF_FILE=$conf_file
STORM_CONF_DIR=`dirname $conf_file`
fi
fi

export STORM_CONF_DIR="${STORM_CONF_DIR:-$STORM_BASE_DIR/conf}"
Expand Down

0 comments on commit 1822491

Please sign in to comment.