From 92ca445a64e173de48548a42c2262db85404621a Mon Sep 17 00:00:00 2001
From: Arnaud Collioud <arnaud.collioud@u-bordeaux.fr>
Date: Wed, 14 Jun 2023 15:55:47 +0200
Subject: [PATCH] Fix downloads and website urls for Rstudio and Rstudio-server

---
 01-main/packages/rstudio        | 4 ++--
 01-main/packages/rstudio-server | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/01-main/packages/rstudio b/01-main/packages/rstudio
index 1631f4a62..2f8e6271c 100644
--- a/01-main/packages/rstudio
+++ b/01-main/packages/rstudio
@@ -3,7 +3,7 @@ get_website "https://posit.co/download/rstudio-desktop/"
 if [ "${ACTION}" != "prettylist" ]; then
     case "${UPSTREAM_CODENAME}" in
         focal|buster|bullseye)
-            URL="$( grep -e "bionic/.*amd64.deb" "${CACHE_FILE}" | grep -v "tar.gz" | head -n1 | cut -d'"' -f4)"
+            URL="$( grep -e "focal/.*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'"' -f4)"
@@ -12,6 +12,6 @@ if [ "${ACTION}" != "prettylist" ]; then
     VERSION_PUBLISHED="$(echo "${URL}" | cut -d'-' -f2-3 | tr - +)"
 fi
 PRETTY_NAME="RStudio"
-WEBSITE="https://www.rstudio.com/"
+WEBSITE="https://posit.co/"
 #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
index 578cc9eab..8235aa7b0 100644
--- a/01-main/packages/rstudio-server
+++ b/01-main/packages/rstudio-server
@@ -3,7 +3,7 @@ get_website "https://posit.co/download/rstudio-server/"
 if [ "${ACTION}" != "prettylist" ]; then
     case "${UPSTREAM_CODENAME}" in
         focal|buster|bullseye)
-            URL="$( grep -o -E "wget.*bionic.*amd64\.deb" "${CACHE_FILE}" | cut -d' ' -f2)"
+            URL="$( grep -o -E "wget.*focal.*amd64\.deb" "${CACHE_FILE}" | cut -d' ' -f2)"
             ;;
         *)
             URL="$( grep -o -E "wget.*jammy.*amd64\.deb" "${CACHE_FILE}" | cut -d' '  -f2)"
@@ -12,6 +12,6 @@ if [ "${ACTION}" != "prettylist" ]; then
     VERSION_PUBLISHED="$(echo "${URL}" |  grep -E -o '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\-[[:digit:]]+' | tr - +)"
 fi
 PRETTY_NAME="RStudio Server"
-WEBSITE="https://www.rstudio.com/"
+WEBSITE="https://posit.co"
 #https://posit.co/products/open-source/rstudio/
 SUMMARY="Professional software for data science teams."