diff --git a/fragments/labels/r.sh b/fragments/labels/r.sh
index 1c98852..fd9e6b4 100644
--- a/fragments/labels/r.sh
+++ b/fragments/labels/r.sh
@@ -1,7 +1,12 @@
r)
name="R"
type="pkg"
- downloadURL="https://cloud.r-project.org/bin/macosx/$( curl -fsL https://cloud.r-project.org/bin/macosx/ | grep -m 1 -o '' | sed -E 's/.+"(.+)".+/\1/g' )"
- appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+ if [[ $(arch) == "arm64" ]]; then
+ downloadURL="https://cloud.r-project.org/bin/macosx/$( curl -fsL https://cloud.r-project.org/bin/macosx/ | grep -m 1 -o '' | sed -E 's/.+"(.+)".+/\1/g' )"
+ appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*\..*/\1/g')
+ elif [[ $(arch) == "i386" ]]; then
+ downloadURL="https://cloud.r-project.org/bin/macosx/$( curl -fsL https://cloud.r-project.org/bin/macosx/ | grep -o '' | grep -m 1 -v "arm64" | sed -E 's/.+"(.+)".+/\1/g' )"
+ appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+ fi
expectedTeamID="VZLD955F6P"
;;
diff --git a/fragments/labels/rstudio.sh b/fragments/labels/rstudio.sh
index 22f735e..6ff3755 100644
--- a/fragments/labels/rstudio.sh
+++ b/fragments/labels/rstudio.sh
@@ -2,6 +2,6 @@ rstudio)
name="RStudio"
type="dmg"
downloadURL=$(curl -s -L "https://rstudio.com/products/rstudio/download/" | grep -m 1 -Eio 'href="https://download1.rstudio.org/desktop/macos/RStudio-(.*).dmg"' | cut -c7- | sed -e 's/"$//')
- appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
+ appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.-]*)\..*/\1/g' | sed 's/-/+/' )
expectedTeamID="FYF2F5GFX4"
;;