From 1782839ad20f48e688da1cb33731c27dbcc5d3ac Mon Sep 17 00:00:00 2001 From: buralien Date: Thu, 19 Dec 2019 08:51:32 +0100 Subject: [PATCH] Added a test for optional whitespace between JSON key and value Added a test if target path is a directory --- getLatestMinecraftServerJar.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/getLatestMinecraftServerJar.sh b/getLatestMinecraftServerJar.sh index d26b65e..af9a2e6 100755 --- a/getLatestMinecraftServerJar.sh +++ b/getLatestMinecraftServerJar.sh @@ -6,8 +6,8 @@ function main { MCJSON=$(curl -s $__MC_JSON_URL) LATEST_VER=$(getJSONVal "$(getJSONData "$MCJSON" latest)" release) - LATEST_URL_DATA=$(echo $MCJSON | egrep -o "\"id\":\"${LATEST_VER}\"[^}]*") - LATEST_VER_URL=$(getJSONVal "$LATEST_URL_DATA" url) + LATEST_URL_DATA=$(echo $MCJSON | egrep -o "\"id\":\s*\"${LATEST_VER}\"[^}]*") + LATEST_VER_URL=$(getJSONVal "$LATEST_URL_DATA" url) MCURLJSON=$(curl -s $LATEST_VER_URL) SERVER_JAR_NAME=minecraft_server_${LATEST_VER}.jar @@ -17,6 +17,9 @@ function main { LOCAL_FILE=$([[ -n $1 ]] && printf $1 || printf /tmp/$SERVER_JAR_NAME) + if [[ -d "${LOCAL_FILE}" ]]; then + LOCAL_FILE=$LOCAL_FILE/$SERVER_JAR_NAME + fi if [[ -a "${LOCAL_FILE}" ]]; then printf "${LOCAL_FILE} exists -- moving to ${LOCAL_FILE}.old\n" mv ${LOCAL_FILE} ${LOCAL_FILE}.old