Revert "rename rstudio-server to rstudio part 1"

This reverts commit bbd43f3.

.github/workflows/test.yaml

@@ -32,7 +32,7 @@ jobs:
             r-packages: ./**/r-packages/**
             r-rig: ./**/r-rig/**
             renv-cache: ./**/renv-cache/**
-            rstudio: ./**/rstudio/**
+            rstudio-server: ./**/rstudio-server/**
 
   test-detects:
     needs:
@@ -56,8 +56,8 @@ jobs:
 
       - name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
         run: devcontainer features test --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
-        # rstudio is not supported on Debian
-        if: matrix.features == 'rstudio' && matrix.baseImage != 'debian:stable-slim' && matrix.baseImage != 'mcr.microsoft.com/devcontainers/base:debian' || matrix.features != 'rstudio'
+        # rstudio-server is not supported on Debian
+        if: matrix.features == 'rstudio-server' && matrix.baseImage != 'debian:stable-slim' && matrix.baseImage != 'mcr.microsoft.com/devcontainers/base:debian' || matrix.features != 'rstudio-server'
 
   test-detectes-scenarios:
     if: ${{ github.event_name == 'pull_request' }}
@@ -122,7 +122,7 @@ jobs:
           - r-packages
           - r-rig
           - renv-cache
-          - rstudio
+          - rstudio-server
     steps:
       - uses: actions/checkout@v3
 

src/rstudio-server/devcontainer-feature.json

@@ -1,9 +1,9 @@
 {
 	"name": "RStudio Server",
-	"id": "rstudio",
+	"id": "rstudio-server",
 	"version": "0.1.0",
 	"description": "Installs the RStudio Server, enables you to run the RStudio IDE.",
-	"documentationURL": "https://github.com/rocker-org/devcontainer-features/tree/main/src/rstudio",
+	"documentationURL": "https://github.com/rocker-org/devcontainer-features/tree/main/src/rstudio-server",
 	"options": {
 		"version": {
 			"type": "string",

test/rstudio-server/scenarios.json

@@ -2,21 +2,21 @@
 	"r-already-installed": {
 		"image": "rocker/r-ver:4.3.0",
 		"features": {
-			"rstudio": {}
+			"rstudio-server": {}
 		}
 	},
 	"version-tag": {
 		"image": "rocker/r-ver",
 		"features": {
-			"rstudio": {
+			"rstudio-server": {
 				"version": "2023.03.2+454"
 			}
 		}
 	},
 	"daily": {
 		"image": "rocker/r-ver",
 		"features": {
-			"rstudio": {
+			"rstudio-server": {
 				"version": "daily"
 			}
 		}