From 1bc6052e4a7186f1768bfcc8f0fda4824c7562a7 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 17 Feb 2023 03:04:28 +0000
Subject: [PATCH 1/2] rstudio server naming updated

move the version one - to the right
---
 01-main/packages/rstudio-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01-main/packages/rstudio-server b/01-main/packages/rstudio-server
index e6fdd5a55..de921f89a 100644
--- a/01-main/packages/rstudio-server
+++ b/01-main/packages/rstudio-server
@@ -9,7 +9,7 @@ if [ "${ACTION}" != "prettylist" ]; then
             URL="$( grep -o -E "wget.*jammy.*amd64\.deb" "${CACHE_FILE}" | cut -d' '  -f2)"
             ;;
     esac
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'-' -f2-3 | tr - +)"
+    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'-' -f3-4 | tr - +)"
 fi
 PRETTY_NAME="RStudio Server"
 WEBSITE="https://www.rstudio.com/"

From 663a5407ed6de21c6628fd5d02c5da46bc674af7 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Sun, 26 Mar 2023 14:10:20 +0100
Subject: [PATCH 2/2] make fix use pattern rather than positional cut

---
 01-main/packages/rstudio-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01-main/packages/rstudio-server b/01-main/packages/rstudio-server
index de921f89a..578cc9eab 100644
--- a/01-main/packages/rstudio-server
+++ b/01-main/packages/rstudio-server
@@ -9,7 +9,7 @@ if [ "${ACTION}" != "prettylist" ]; then
             URL="$( grep -o -E "wget.*jammy.*amd64\.deb" "${CACHE_FILE}" | cut -d' '  -f2)"
             ;;
     esac
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'-' -f3-4 | tr - +)"
+    VERSION_PUBLISHED="$(echo "${URL}" |  grep -E -o '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\-[[:digit:]]+' | tr - +)"
 fi
 PRETTY_NAME="RStudio Server"
 WEBSITE="https://www.rstudio.com/"