Merge branch 'fix/mac_launcher_wrong_download' into 'master'
Fix: filter for sig files to prevent wrong download See merge request sheepitrenderfarm/client!227
This commit is contained in:
@@ -26,7 +26,7 @@ if [ ! -e "./$APP" ]; then #If JRE exists in the dmg, don't download it
|
|||||||
BIN="$LAUDIR/$APP"
|
BIN="$LAUDIR/$APP"
|
||||||
JREVERSION="$LAUDIR/JRE-Version"
|
JREVERSION="$LAUDIR/JRE-Version"
|
||||||
echo "Checking for JRE updates"
|
echo "Checking for JRE updates"
|
||||||
JRE_LATEST="$(curl --connect-timeout 20 --retry 4 --silent --show-error $REPO | grep $JREDISTRO | grep name | grep tar | grep -v json | grep -v txt | cut -d '"' -f 4 | head -n 1)"
|
JRE_LATEST="$(curl --connect-timeout 20 --retry 4 --silent --show-error $REPO | grep $JREDISTRO | grep name | grep tar | grep -v json | grep -v txt | grep -v sig | cut -d '"' -f 4 | head -n 1)"
|
||||||
if [ -z "$JRE_LATEST" ]; then
|
if [ -z "$JRE_LATEST" ]; then
|
||||||
# Empty JRE_LATEST is a good indicator of a critical failure
|
# Empty JRE_LATEST is a good indicator of a critical failure
|
||||||
echo "!!! Failed parsing JRE information! Aborting !!!"
|
echo "!!! Failed parsing JRE information! Aborting !!!"
|
||||||
|
|||||||
Reference in New Issue
Block a user