Update buildLabel.sh

This commit is contained in:
Søren Theilgaard
2021-09-17 20:02:21 +02:00
parent 65b82cf20d
commit eb501486e4

View File

@@ -65,25 +65,26 @@ appInvestigation() {
fi fi
} }
echo "downloadOut:\n${downloadOut}" #echo "downloadOut:\n${downloadOut}"
archiveTempName=$( echo "${downloadOut}" | head -1 ) archiveTempName=$( echo "${downloadOut}" | head -1 )
echo "archiveTempName: $archiveTempName" echo "archiveTempName: $archiveTempName"
archivePath=$( echo "${downloadOut}" | tail -1 ) archivePath=$( echo "${downloadOut}" | tail -1 )
echo "archivePath: $archivePath" echo "archivePath: $archivePath"
try1archiveName=${archiveTempName##*/} try1archiveName=${${archiveTempName##*/}%%\?*}
try2archiveName=${archivePath##*/} try2archiveName=${${archivePath##*/}%%\?*}
fileName_re='^([a-zA-Z0-9\_.-]*)\.(dmg|pkg|zip|tbz)$' fileName_re='^([a-zA-Z0-9\_.%-]*)\.(dmg|pkg|zip|tbz)$'
if [[ "${try1archiveName}" =~ $fileName_re ]]; then if [[ "${try1archiveName}" =~ $fileName_re ]]; then
archiveName=${try1archiveName} archiveName=${try1archiveName}
elif [[ "${try2archiveName}" =~ $fileName_re ]]; then elif [[ "${try2archiveName}" =~ $fileName_re ]]; then
archiveName=${try2archiveName} archiveName=${try2archiveName}
else else
echo "Could not determine archiveName from “$try1archiveName” and “$try2archiveName" echo "Could not determine archiveName from “$try1archiveName” and “$try2archiveName"
#echo "Extensions $archiveTempName:t:e $archivePath:t:e"
exit exit
fi fi
echo "archiveName: $archiveName" echo "Calculated archiveName: $archiveName"
mv $archiveTempName $archiveName mv $archiveTempName $archiveName
name=${archiveName%.*} name=${archiveName%.*}
echo "name: $name" echo "name: $name"