diff --git a/fragments/functions.sh b/fragments/functions.sh index e43d607..6c11f42 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -160,10 +160,10 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name if [ -n "$archiveName" ]; then #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }") - downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "\/releases\/download\/.*$archiveName" | head -1) + downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*$archiveName" | head -1) else #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }") - downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "\/releases\/download\/.*\.$filetype" | head -1) + downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1) fi if [ -z "$downloadURL" ]; then cleanupAndExit 14 "could not retrieve download URL for $gitusername/$gitreponame" ERROR diff --git a/fragments/labels/cocoapods.sh b/fragments/labels/cocoapods.sh index 6b5c8a2..1ebc7a3 100644 --- a/fragments/labels/cocoapods.sh +++ b/fragments/labels/cocoapods.sh @@ -1,7 +1,6 @@ cocoapods) name="CocoaPods" type="bz2" - archiveName="CocoaPods.app-[0-9.]*.tar.bz2" downloadURL="$(downloadURLFromGit CocoaPods CocoaPods-app)" appNewVersion="$(versionFromGit CocoaPods CocoaPods-app)" expectedTeamID="AX2Q2BH2XR" diff --git a/utils/checkLabels.sh b/utils/checkLabels.sh index 5a83f9b..3063846 100755 --- a/utils/checkLabels.sh +++ b/utils/checkLabels.sh @@ -64,9 +64,9 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name #echo "$githubPart" #downloadURL="https://github.com/$gitusername/$gitreponame/releases/latest" if [ -n "$archiveName" ]; then - downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "\/releases\/download\/.*$archiveName" | head -1) + downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*$archiveName" | head -1) else - downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "\/releases\/download\/.*\.$filetype" | head -1) + downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1) fi echo "$downloadURL" return 0 @@ -195,6 +195,7 @@ for fixedArch in i386 arm64; do #caseLabel if cat "${labels_dir}/${label}.sh" | grep -v -E '^[a-z0-9\_-]*(\)|\|\\)$' | grep -v ";;" > checkLabelCurrent.sh; then + INSTALL=force # This is only to prevent various Microsoft labels from running "msupdate --list" source checkLabelCurrent.sh echo "Name: $name"