diff --git a/Scripts/download_framework.sh b/Scripts/download_framework.sh index cbcee2c9..079deed0 100755 --- a/Scripts/download_framework.sh +++ b/Scripts/download_framework.sh @@ -21,24 +21,20 @@ if [ -z $URL ]; then exit 1 fi -if [ -z $LOGFILE ]; then -LOGFILE="/tmp/${LOCALBASE}.txt" -fi - #first argument is error message. exit_with_error () { -echo "Error: $1" >> "${LOGFILE}" +echo "Error: $1" if [ -f "${NEWFILEPATH}" ]; then -rm -rf "${NEWFILEPATH}" 2>>"${LOGFILE}" +rm -rf "${NEWFILEPATH}" 2 fi exit 1 } -echo "----------------------------------------------------------" >> $LOGFILE -echo "Logs for ${LOCALBASE}" >> $LOGFILE +echo "----------------------------------------------------------" +echo "Logs for ${LOCALBASE}" -echo -e "Local Target: ${LOCALPATH}" >> $LOGFILE -echo -e "Remote Source: ${REMOTEPATH}" >> $LOGFILE +echo -e "Local Target: ${LOCALPATH}" +echo -e "Remote Source: ${REMOTEPATH}" if [ -z "$LOCALPATH" ]; then exit_with_error "Missing local path argument" @@ -49,31 +45,31 @@ exit_with_error "Missing filename path argument" fi #get local and remote checksums for comparison -echo -e "Getting checksums..." >> $LOGFILE -echo -e "URL: ${URL}/api/storage/${REMOTEPATH}" >> $LOGFILE -JSON=$(curl --header "X-JFrog-Art-Api: ${APITOKEN}" -X GET "${URL}/api/storage/${REMOTEPATH}" 2>>"${LOGFILE}") -CHECKSUM=$(echo "$JSON" | python -c 'import sys, json; print json.load(sys.stdin)["checksums"]["sha1"]') 2>>"${LOGFILE}" +echo -e "Getting checksums..." +echo -e "URL: ${URL}/api/storage/${REMOTEPATH}" +JSON=$(curl --header "X-JFrog-Art-Api: ${APITOKEN}" -X GET "${URL}/api/storage/${REMOTEPATH}") +CHECKSUM=$(echo "$JSON" | python -c 'import sys, json; print json.load(sys.stdin)["checksums"]["sha1"]')" if [[ -z "$CHECKSUM" ]]; then exit_with_error "No Checksum found in json: ${JSON}" fi -echo "Remote checksum ${CHECKSUM}" >> "${LOGFILE}" +echo "Remote checksum ${CHECKSUM}" OLDCHECKSUM=$(cat "${VERSIONFILE}" 2>/dev/null) -echo "Local checksum ${OLDCHECKSUM}" >> "${LOGFILE}" +echo "Local checksum ${OLDCHECKSUM}" #get new framework if no original framework, no local checksum, or remote checksum is different from local. if [ ! -e "${LOCALPATH}" ] || [ -z "$OLDCHECKSUM" ] || [ "$CHECKSUM" != "$OLDCHECKSUM" ]; then -echo "Downloading..." >> "${LOGFILE}" -echo -e "URL: ${URL}/${REMOTEPATH}" >> $LOGFILE -curl --header "X-JFrog-Art-Api: ${APITOKEN}" -f -X GET "$URL/$REMOTEPATH" --output "${NEWFILEPATH}" 2>>"${LOGFILE}" +echo "Downloading..." +echo -e "URL: ${URL}/${REMOTEPATH}" +curl --header "X-JFrog-Art-Api: ${APITOKEN}" -f -X GET "$URL/$REMOTEPATH" --output "${NEWFILEPATH}" if [ $? -eq 0 ] && [ -e "${NEWFILEPATH}" ]; then -echo "Finished Downloading, begin unzip" >> "${LOGFILE}" -unzip -q -o "${NEWFILEPATH}" -d "${LOCALDIR}" 2>>"${LOGFILE}" +echo "Finished Downloading, begin unzip" +unzip -q -o "${NEWFILEPATH}" -d "${LOCALDIR}" if [ $? -eq 0 ]; then -echo "Finished unzipping, remove zip" >> "${LOGFILE}" -rm -rf "${NEWFILEPATH}" 2>>"${LOGFILE}" -echo "Writing new checksum to file" >> "${LOGFILE}" -echo "${CHECKSUM}" > "${VERSIONFILE}" 2>>"${LOGFILE}" -echo "Successfully downloaded and unzipped archive." >> "${LOGFILE}" +echo "Finished unzipping, remove zip" +rm -rf "${NEWFILEPATH}" +echo "Writing new checksum to file" +echo "${CHECKSUM}" > "${VERSIONFILE}" +echo "Successfully downloaded and unzipped archive." else exit_with_error "Error unzipping" fi @@ -81,5 +77,5 @@ else exit_with_error "Failed to download" fi else -echo "Successful, No New Version" >> "${LOGFILE}" +echo "Successful, No New Version" fi