Allow manual deb file to be installed (#1831)

* Allow manual deb file to be installed

* Return if rstudio server is already installed

Author: Bryan Kneis

cmd/agent/container/setup.go

@@ -460,7 +460,10 @@ func (cmd *SetupContainerCmd) installIDE(setupInfo *config.Result, ide *provider
 	case string(config2.IDEJupyterNotebook):
 		return jupyter.NewJupyterNotebookServer(setupInfo.SubstitutionContext.ContainerWorkspaceFolder, config.GetRemoteUser(setupInfo), ide.Options, log).Install()
 	case string(config2.IDERStudio):
-		return rstudio.NewRStudioServer(setupInfo.SubstitutionContext.ContainerWorkspaceFolder, config.GetRemoteUser(setupInfo), ide.Options, log).Install()
+		err := rstudio.NewRStudioServer(setupInfo.SubstitutionContext.ContainerWorkspaceFolder, config.GetRemoteUser(setupInfo), ide.Options, log).Install()
+		if err != nil {
+			log.Errorf("could not install rstudio with error: %w", err)
+		}
 	}
 
 	return nil

pkg/ide/rstudio/rstudio.go

@@ -81,31 +81,36 @@ type RStudioServer struct {
 var codenameRegEx = regexp.MustCompile(`\nUBUNTU_CODENAME=(.*)\n`)
 
 func (o *RStudioServer) Install() error {
+	debPath := filepath.Join(filepath.ToSlash(downloadFolder), "rstudio-server.deb")
+	// R has to be installed
+	if !command.ExistsForUser("R", o.userName) {
+		return fmt.Errorf("R has to be available in image to use RStudio") //nolint:all
+	}
+
 	// Skip if already installed
 	if command.ExistsForUser("rstudio-server", o.userName) {
 		o.log.Debug("RStudio is already installed, skipping installation")
 		return nil
 	}
-
-	// R has to be installed
-	if !command.ExistsForUser("R", o.userName) {
-		return fmt.Errorf("R has to be available in image to use RStudio") //nolint:all
-	}
 	o.log.Info("Installing RStudio")
 
 	err := ensureGdebi(o.log)
 	if err != nil {
 		return err
 	}
 
-	codename, err := getDistroCodename(o.log)
-	if err != nil {
-		return nil
-	}
+	// Check if local file exists
+	if _, err := os.Stat(debPath); os.IsNotExist(err) {
+		o.log.Info("Rstudio deb not file, downloading ...")
+		codename, err := getDistroCodename(o.log)
+		if err != nil {
+			return err
+		}
 
-	debPath, err := downloadRStudioDeb(codename, o.log)
-	if err != nil {
-		return nil
+		debPath, err = downloadRStudioDeb(codename, o.log)
+		if err != nil {
+			return err
+		}
 	}
 
 	err = installDeb(debPath, o.log)