IntelliJ: simple bash variables

.travis/build.sh

@@ -3,7 +3,7 @@
 
 trap 'kill -9 $(pgrep -g $$ | grep -v $$) >& /dev/null' EXIT SIGINT SIGTERM
 
-. tools/batfish_functions.sh
+. "$(dirname "$0")/../tools/batfish_functions.sh"
 
 
 # Build batfish and run the Maven unit tests.
@@ -59,7 +59,7 @@ echo -e "\n .... Failed tests: "
 
 echo -e "\n .... Diffing failed tests:"
 for i in $("$GNU_FIND" -name *.testout); do
-   echo -e "\n $i"; diff -u ${i%.testout} $i
+   echo -e "\n $i"; diff -u ${i%.testout} ${i}
 done
 
-exit $exit_code
+exit ${exit_code}

.travis/common.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 if [[ "$(uname)" == 'Darwin' && -n "$(which gfind)" ]]; then
    GNU_FIND=gfind
 else

.travis/install.sh

@@ -3,11 +3,11 @@
 TMP_DIR=$(mktemp -d)
 cd ${TMP_DIR} || exit 1
 
-if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+if [[ ${TRAVIS_OS_NAME} == 'linux' ]]; then
    sudo "${TRAVIS_BUILD_DIR}/tools/install_z3_ubuntu.sh" /usr || exit 1
    z3 --version || exit 1
-elif [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-   sudo $TRAVIS_BUILD_DIR/tools/install_z3_osx.sh || exit 1
+elif [[ ${TRAVIS_OS_NAME} == 'osx' ]]; then
+   sudo ${TRAVIS_BUILD_DIR}/tools/install_z3_osx.sh || exit 1
    brew update || exit 1
    which gfind || brew install findutils || exit 1
    gfind --version || exit 1

projects/allinone/allinone

@@ -4,15 +4,15 @@ ALLINONE_PATH=$(dirname "$ALLINONE")
 ALLINONE_JAR="$ALLINONE_PATH/target/allinone-bundle-${BATFISH_VERSION}.jar"
 CPSEP=":"
 if batfish_cygwin; then
-   ALLINONE_JAR="$(cygpath -w $ALLINONE_JAR)"
+   ALLINONE_JAR="$(cygpath -w ${ALLINONE_JAR})"
    ALLINONE_JAVA_ARGS="$ALLINONE_JAVA_ARGS -Djline.terminal=jline.UnixTerminal"
    stty -icanon min 1 -echo
    CPSEP=";"
 fi
-java $ALLINONE_JAVA_ARGS -cp "${ALLINONE_JAR}${CPSEP}${ALLINONE_CLASSPATH}" org.batfish.allinone.Main "$@"
+java ${ALLINONE_JAVA_ARGS} -cp "${ALLINONE_JAR}${CPSEP}${ALLINONE_CLASSPATH}" org.batfish.allinone.Main "$@"
 EXIT_CODE=$?
 if batfish_cygwin; then
    stty icanon echo
 fi
-exit $EXIT_CODE
+exit ${EXIT_CODE}
 

projects/batfish-client/batfish-client

@@ -1,6 +1,6 @@
 #!/bin/bash
 BATFISH_CLIENT=${BASH_SOURCE[0]}
-BATFISH_CLIENT_PATH=$(dirname $BATFISH_CLIENT)
+BATFISH_CLIENT_PATH=$(dirname ${BATFISH_CLIENT})
 ALLINONE_PATH="${BATFISH_CLIENT_PATH}/../allinone"
 ALLINONE_JAR="$ALLINONE_PATH/target/allinone-bundle-${BATFISH_VERSION}.jar"
 CPSEP=":"
@@ -10,10 +10,10 @@ if batfish_cygwin; then
    stty -icanon min 1 -echo
    CPSEP=";"
 fi
-java $BATFISH_CLIENT_JAVA_ARGS -cp "${ALLINONE_JAR}${CPSEP}${BATFISH_CLIENT_CLASSPATH}" org.batfish.client.Main "$@"
+java ${BATFISH_CLIENT_JAVA_ARGS} -cp "${ALLINONE_JAR}${CPSEP}${BATFISH_CLIENT_CLASSPATH}" org.batfish.client.Main "$@"
 EXIT_CODE=$?
 if batfish_cygwin; then
    stty icanon echo
 fi
-exit $EXIT_CODE
+exit ${EXIT_CODE}
 

projects/batfish/batfish

@@ -1,6 +1,6 @@
 #!/bin/bash
 BATFISH="${BASH_SOURCE[0]}"
-BATFISH_PATH="$(dirname $BATFISH)"
+BATFISH_PATH="$(dirname ${BATFISH})"
 ALLINONE_PATH="${BATFISH_PATH}/../allinone"
 ALLINONE_JAR="$ALLINONE_PATH/target/allinone-bundle-${BATFISH_VERSION}.jar"
 CPSEP=":"

projects/coordinator/coordinator

@@ -8,5 +8,5 @@ if batfish_cygwin; then
    ALLINONE_JAR="$(cygpath -w "$ALLINONE_JAR")"
    CPSEP=";"
 fi
-java $COORDINATOR_JAVA_ARGS -cp "${ALLINONE_JAR}${CPSEP}${COORDINATOR_CLASSPATH}" org.batfish.coordinator.Main "$@"
+java ${COORDINATOR_JAVA_ARGS} -cp "${ALLINONE_JAR}${CPSEP}${COORDINATOR_CLASSPATH}" org.batfish.coordinator.Main "$@"
 

tools/common.sh

@@ -48,17 +48,17 @@ batfish() {
    if batfish_cygwin; then
       local NUMARGS=$#
       local IGNORE_CURRENT_ARG=no;
-      for i in $(seq 1 $NUMARGS); do
+      for i in $(seq 1 ${NUMARGS}); do
          local CURRENT_ARG=$1
-         local NEW_ARG="$(cygpath -w -- $CURRENT_ARG)"
+         local NEW_ARG="$(cygpath -w -- ${CURRENT_ARG})"
          set -- "$@" "$NEW_ARG"
          shift
       done
    fi
    if [ "$BATFISH_PRINT_CMDLINE" = "yes" ]; then
       echo "$BATFISH $BATFISH_COMMON_ARGS $@" >&2
    fi
-   "$BATFISH" $BATFISH_COMMON_ARGS "$@"
+   "$BATFISH" ${BATFISH_COMMON_ARGS} "$@"
 }
 export -f batfish
 
@@ -139,7 +139,7 @@ export -f _batfish_test_all
 batfish_confirm() {
    # call with a prompt string or use a default
    read -r -p "${1:-Are you sure? [y/N]} " response < /dev/tty
-   case $response in
+   case ${response} in
       [yY][eE][sS]|[yY])
          true
       ;;
@@ -183,11 +183,11 @@ export -f batfish_expect_min_args
 batfish_javadocs() {
    echo "Generating batfish project javadocs"
    batfish_build_all doc
-   cp -r $COMMON_PATH/doc $BATFISH_ROOT/doc/batfish-common-protocol/
-   cp -r $BATFISH_PATH/doc $BATFISH_ROOT/doc/batfish/
-   cp -r $BATFISH_CLIENT_PATH/doc $BATFISH_ROOT/doc/batfish-client/
-   cp -r $COORDINATOR_PATH/doc $BATFISH_ROOT/doc/coordinator/
-   cp -r $ALLINONE_PATH/doc $BATFISH_ROOT/doc/allinone/
+   cp -r ${COMMON_PATH}/doc ${BATFISH_ROOT}/doc/batfish-common-protocol/
+   cp -r ${BATFISH_PATH}/doc ${BATFISH_ROOT}/doc/batfish/
+   cp -r ${BATFISH_CLIENT_PATH}/doc ${BATFISH_ROOT}/doc/batfish-client/
+   cp -r ${COORDINATOR_PATH}/doc ${BATFISH_ROOT}/doc/coordinator/
+   cp -r ${ALLINONE_PATH}/doc ${BATFISH_ROOT}/doc/allinone/
 }
 export -f batfish_javadocs
 
@@ -198,42 +198,42 @@ batfish_prepare_test_rig() {
    local TEST_RIG=$1
    local BASE=$2
    local NAME=$3
-   mkdir -p $BASE/testrigs/$NAME/testrig || return 1
-   mkdir -p $BASE/testrigs/$NAME/environments/default/env_default
-   cp -r $TEST_RIG/. $BASE/testrigs/$NAME/testrig/.
+   mkdir -p ${BASE}/testrigs/${NAME}/testrig || return 1
+   mkdir -p ${BASE}/testrigs/${NAME}/environments/default/env_default
+   cp -r ${TEST_RIG}/. ${BASE}/testrigs/${NAME}/testrig/.
    batfish_date
    echo ": END: Prepare test-rig"
 }
 export -f batfish_prepare_test_rig
 
 batfish_reload() {
-   . $BATFISH_SOURCED_SCRIPT
+   . ${BATFISH_SOURCED_SCRIPT}
 }
 export -f batfish_reload
 
 batfish_unit_tests_parser() {
    local UNIT_TEST_NAME=unit-tests
-   local UNIT_TEST_DIR=$BATFISH_TEST_RIG_PATH/$UNIT_TEST_NAME
+   local UNIT_TEST_DIR=${BATFISH_TEST_RIG_PATH}/${UNIT_TEST_NAME}
    batfish_date
    echo ": START UNIT TEST: Vendor configuration parser"
-   batfish_prepare_test_rig $UNIT_TEST_DIR $PWD $UNIT_TEST_NAME
-   batfish -containerdir $PWD -testrig $UNIT_TEST_NAME -sv "$@" -haltonparseerror -haltonconverterror -urf false
+   batfish_prepare_test_rig ${UNIT_TEST_DIR} $PWD ${UNIT_TEST_NAME}
+   batfish -containerdir $PWD -testrig ${UNIT_TEST_NAME} -sv "$@" -haltonparseerror -haltonconverterror -urf false
    batfish_date
    echo ": END UNIT TEST: Vendor configuration parser"
 }
 export -f batfish_unit_tests_parser
 
 batfish_datamodel() {
-   echo "Generating datamodel to " $BATFISH_DOCS_DATAMODEL
+   echo "Generating datamodel to " ${BATFISH_DOCS_DATAMODEL}
    batfish_client -runmode gendatamodel > "$BATFISH_DOCS_DATAMODEL"
 
-   echo "Generating wiki page to " $BATFISH_WIKI_DATAMODEL
+   echo "Generating wiki page to " ${BATFISH_WIKI_DATAMODEL}
    python "$BATFISH_DATAMODEL_PAGE_SCRIPT" "$BATFISH_DOCS_DATAMODEL" > "$BATFISH_WIKI_DATAMODEL"
 }
 export -f batfish_datamodel
 
 batfish_wiki_questions() {
-   echo "Generating questions to " $BATFISH_WIKI_QUESTIONS
+   echo "Generating questions to " ${BATFISH_WIKI_QUESTIONS}
    python "$BATFISH_QUESTIONS_PAGE_SCRIPT" "$QUESTION_PATH/src" > "$BATFISH_WIKI_QUESTIONS"
 }
 export -f batfish_wiki_questions
@@ -276,17 +276,17 @@ coordinator() {
    # if cygwin, shift and replace each parameter
    if batfish_cygwin; then
       local NUMARGS=$#
-      for i in $(seq 1 $NUMARGS); do
+      for i in $(seq 1 ${NUMARGS}); do
          local CURRENT_ARG=$1
-         local NEW_ARG="$(cygpath -w -- $CURRENT_ARG)"
+         local NEW_ARG="$(cygpath -w -- ${CURRENT_ARG})"
          set -- "$@" "$NEW_ARG"
          shift
       done
    fi
    if [ "$COORDINATOR_PRINT_CMDLINE" = "yes" ]; then
       echo "$COORDINATOR $COORDINATOR_COMMON_ARGS $@"
    fi
-   $COORDINATOR $COORDINATOR_COMMON_ARGS "$@"
+   ${COORDINATOR} ${COORDINATOR_COMMON_ARGS} "$@"
 }
 export -f coordinator
 
@@ -299,17 +299,17 @@ batfish_client() {
    # if cygwin, shift and replace each parameter
    if batfish_cygwin; then
       local NUMARGS=$#
-      for i in $(seq 1 $NUMARGS); do
+      for i in $(seq 1 ${NUMARGS}); do
          local CURRENT_ARG=$1
-         local NEW_ARG="$(cygpath -w -- $CURRENT_ARG)"
+         local NEW_ARG="$(cygpath -w -- ${CURRENT_ARG})"
          set -- "$@" "$NEW_ARG"
          shift
       done
    fi
    if [ "$BATFISH_CLIENT_PRINT_CMDLINE" = "yes" ]; then
       echo "$BATFISH_CLIENT $BATFISH_CLIENT_COMMON_ARGS $@"
    fi
-   $BATFISH_CLIENT $BATFISH_CLIENT_COMMON_ARGS "$@"
+   ${BATFISH_CLIENT} ${BATFISH_CLIENT_COMMON_ARGS} "$@"
 }
 export -f batfish_client
 
@@ -333,17 +333,17 @@ allinone() {
    # if cygwin, shift and replace each parameter
    if batfish_cygwin; then
       local NUMARGS=$#
-      for i in $(seq 1 $NUMARGS); do
+      for i in $(seq 1 ${NUMARGS}); do
          local CURRENT_ARG=$1
-         local NEW_ARG="$(cygpath -w -- $CURRENT_ARG)"
+         local NEW_ARG="$(cygpath -w -- ${CURRENT_ARG})"
          set -- "$@" "$NEW_ARG"
          shift
       done
    fi
    if [ "$ALLINONE_PRINT_CMDLINE" = "yes" ]; then
       echo "$ALLINONE $ALLINONE_COMMON_ARGS $@"
    fi
-   "$ALLINONE" $ALLINONE_COMMON_ARGS "$@"
+   "$ALLINONE" ${ALLINONE_COMMON_ARGS} "$@"
 }
 export -f allinone
 

tools/completion-allinone.sh

@@ -9,11 +9,11 @@ _allinone()
       fi
    done
    if [ "$prev" = "-loglevel" ]; then
-      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- $cur) )
+      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- ${cur}) )
    elif [ "$prev" = "-runmode" ]; then
-      COMPREPLY=( $(compgen -W "$(echo batch interactive)" -- $cur) )
+      COMPREPLY=( $(compgen -W "$(echo batch interactive)" -- ${cur}) )
    else
-      COMPREPLY=( $(compgen -fW "$(cat $ALLINONE_COMPLETION_FILE)" -- $cur) )
+      COMPREPLY=( $(compgen -fW "$(cat ${ALLINONE_COMPLETION_FILE})" -- ${cur}) )
    fi
 }
 complete -F _allinone allinone

tools/completion-batfish-client.sh

@@ -9,11 +9,11 @@ _batfish_client()
       fi
    done
    if [ "$prev" = "-loglevel" ]; then
-      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- $cur) )
+      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- ${cur}) )
    elif [ "$prev" = "-runmode" ]; then
-      COMPREPLY=( $(compgen -W "$(echo batch interactive)" -- $cur) )
+      COMPREPLY=( $(compgen -W "$(echo batch interactive)" -- ${cur}) )
    else
-      COMPREPLY=( $(compgen -fW "$(cat $BATFISH_CLIENT_COMPLETION_FILE)" -- $cur) )
+      COMPREPLY=( $(compgen -fW "$(cat ${BATFISH_CLIENT_COMPLETION_FILE})" -- ${cur}) )
    fi
 }
 complete -F _batfish_client batfish_client

tools/completion-batfish.sh

@@ -9,9 +9,9 @@ _batfish()
       fi
    done
    if [ "$prev" = "-loglevel" ]; then
-      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- $cur) )
+      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- ${cur}) )
    else
-      COMPREPLY=( $(compgen -fW "$(cat $BATFISH_COMPLETION_FILE)" -- $cur) )
+      COMPREPLY=( $(compgen -fW "$(cat ${BATFISH_COMPLETION_FILE})" -- ${cur}) )
    fi
 }
 complete -F _batfish batfish

tools/completion-coordinator.sh

@@ -9,9 +9,9 @@ _coordinator()
       fi
    done
    if [ "$prev" = "-loglevel" ]; then
-      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- $cur) )
+      COMPREPLY=( $(compgen -W "$(grep 'private static final String LEVELSTR' ${COMMON_PATH}/src/org/batfish/common/BatfishLogger.java | sed 's/.* = "\([^"]*\)".*$/\1/g' | tr '\n' ' ')" -- ${cur}) )
    else
-      COMPREPLY=( $(compgen -fW "$(cat $COORDINATOR_COMPLETION_FILE)" -- $cur) )
+      COMPREPLY=( $(compgen -fW "$(cat ${COORDINATOR_COMPLETION_FILE})" -- ${cur}) )
    fi
 }
 complete -F _coordinator coordinator