diff --git a/mca.sh b/mca.sh index 4cb06ba..9b04e93 100755 --- a/mca.sh +++ b/mca.sh @@ -117,6 +117,10 @@ if [ -e "$MCA_RC_FILE" ]; then set -a . -- "$MCA_RC_FILE" set +a + + MCA_RC_FILE_READ=1 +else + MCA_RC_FILE_READ=0 fi if [ -z "$PLATFORM" ]; then @@ -207,11 +211,11 @@ fi MCA_CMD="$(which java) -server $JVM_FLAGS -jar $MCA_JAR" -if [ "$SKIP_CONFIGURE" -eq 0 ]; then - ENV_LIST="$(cut -d= -f1 < ./.mcarc | sed 's/^/$/g'))" +if [ "$SKIP_CONFIGURE" -eq 0 ] && [ "$MCA_RC_FILE_READ" -eq 1 ]; then + ENV_LIST="$(cut -d= -f1 < "$MCA_RC_FILE" | sed 's/^/$/g'))" FILE_LIST="$(find . -name '*.in' -type f)" - echo "$FILE_LIST" | while read -r line; do + [ -z "$FILE_LIST" ] || echo "$FILE_LIST" | while read -r line; do envsubst "$ENV_LIST" < "$line" > "${line%*.in}" done fi