Re-submission of rstudio fix for move to posit.io (wimpysworld#676)

* Re-submission of rstudio fix for move to posit.io * adapted rstudio desktop and server to website cache
philclifford · Jan 23, 2023 · 74307e5 · 74307e5
1 parent b42d83e
commit 74307e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/01-main/packages/rstudio b/01-main/packages/rstudio
@@ -1,16 +1,17 @@
 DEFVER=1
-get_website "https://www.rstudio.com/products/rstudio/download/"
+get_website "https://posit.co/download/rstudio-desktop/"
 if [ "${ACTION}" != "prettylist" ]; then
     case "${UPSTREAM_CODENAME}" in
-        focal)
-            URL="$(grep -e "bionic/.*amd64.deb" "${CACHE_FILE}" | grep -v "tar.gz" | head -n1 | cut -d'"' -f2)"
+        focal|buster|bullseye)
+            URL="$( grep -e "bionic/.*amd64.deb" "${CACHE_FILE}" | grep -v "tar.gz" | head -n1 | cut -d'"' -f4)"
             ;;
         *)
-            URL="$(grep -e "jammy/.*amd64.deb" "${CACHE_FILE}" | grep -v "tar.gz" | head -n1 | cut -d'"' -f2)"
+            URL="$( grep -e "jammy/.*amd64.deb" "${CACHE_FILE}" | grep -v "tar.gz" | head -n1 | cut -d'"' -f4)"
             ;;
     esac
     VERSION_PUBLISHED="$(echo "${URL}" | cut -d'-' -f2-3 | tr - +)"
 fi
 PRETTY_NAME="RStudio"
 WEBSITE="https://www.rstudio.com/"
+#https://posit.co/products/open-source/rstudio/
 SUMMARY="Professional software for data science teams."
diff --git a/01-main/packages/rstudio-server b/01-main/packages/rstudio-server
@@ -1,11 +1,12 @@
 DEFVER=1
+get_website "https://posit.co/download/rstudio-server/"
 if [ "${ACTION}" != "prettylist" ]; then
     case "${UPSTREAM_CODENAME}" in
         focal|buster|bullseye)
-            URL="$(curl -s "https://posit.co/download/rstudio-server/" | grep -o -E "wget.*bionic.*amd64\.deb"| cut -d' ' -f2)"
+            URL="$( grep -o -E "wget.*bionic.*amd64\.deb" "${CACHE_FILE}" | cut -d' ' -f2)"
             ;;
         *)
-            URL="$(curl -s "https://posit.co/download/rstudio-server/"| grep -o -E "wget.*jammy.*amd64\.deb"| cut -d' '  -f2)"
+            URL="$( grep -o -E "wget.*jammy.*amd64\.deb" "${CACHE_FILE}" | cut -d' '  -f2)"
             ;;
     esac
     VERSION_PUBLISHED="$(echo "${URL}" | cut -d'-' -f2-3 | tr - +)"