directly install vscode-server

vscode-server/README.md

@@ -1,25 +1,26 @@
 ---
-display_name: vscode-web
+display_name: vscode-server
 description: VS Code Web - Visual Studio Code in the browser
 icon: ../.icons/code.svg
-maintainer_github: coder
+maintainer_github: matifali
 verified: true
 tags: [helper, ide, vscode, web]
 ---
 
 # VS Code Web
 
-Automatically install [VS Code](https://code.visualstudio.com) in a workspace, create an app to access it via the dashboard.
+Automatically install [Visual Studio Code Server](https://code.visualstudio.com/docs/remote/vscode-server) in a workspace, create an app to access it via the dashboard.
 
 ## Examples
 
-1. Install VS Code Web with default settings:
+1. Install VS Code Server with default settings:
 
    ```hcl
    module "vscode-web" {
      source         = "https://registry.coder.com/modules/vscode-web"
      agent_id       = coder_agent.example.id
      accept_license = true
+     telemetry      = "off"
    }
    ```
 
@@ -29,8 +30,9 @@ Automatically install [VS Code](https://code.visualstudio.com) in a workspace, c
    module "vscode-web" {
      source          = "https://registry.coder.com/modules/vscode-web"
      agent_id        = coder_agent.example.id
-     install_dir     = "/home/coder/.coder/apps/vscode"
+     install_dir     = "/home/coder/.vscode-server"
      folder          = "/home/coder"
      accept_license  = true
+     telemetry       = "off"
    }
    ```

vscode-server/main.tf

@@ -22,20 +22,29 @@ variable "port" {
 
 variable "folder" {
   type        = string
-  description = "The folder to open in VS Code Web."
+  description = "The folder to open in vscode-server."
   default     = ""
 }
 
 variable "log_path" {
   type        = string
   description = "The path to log."
-  default     = "/tmp/vscode-web.log"
+  default     = "/tmp/vscode-server.log"
+}
+
+variable "telemetry" {
+  type        = string
+  description = "Telemetry options for vscode-server. Valid values are 'off', 'crash', 'error' or 'all'."
+  default     = "crash"
+  validation {
+    condition = var.telemetry == "off" || var.telemetry == "crash" || var.telemetry == "error" || var.telemetry == "all"
+  }
 }
 
 variable "install_dir" {
   type        = string
-  description = "The directory to install VS Code"
-  default     = "~/.vscodeweb"
+  description = "The directory to install VS Code Server"
+  default     = "/tmp/vscode-server"
 }
 
 variable "accept_license" {
@@ -56,7 +65,7 @@ variable "custom_version" {
 
 resource "coder_script" "vscode-web" {
   agent_id     = var.agent_id
-  display_name = "VS Code Web"
+  display_name = "vscode-server"
   icon         = "/icon/code.svg"
   script = templatefile("${path.module}/run.sh", {
     PORT : var.port,
@@ -70,7 +79,7 @@ resource "coder_script" "vscode-web" {
 resource "coder_app" "vscode-web" {
   agent_id     = var.agent_id
   slug         = "vscode-web"
-  display_name = "VS Code Web"
+  display_name = "vscode-server"
   url          = "http://localhost:${var.port}/?folder=${var.folder}"
   icon         = "/icon/code.svg"
   subdomain    = true

vscode-server/run.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+BOLD='\033[0;1m'
+
+printf "$${BOLD} Installing vscode-server!\n"
+# Download and extract vsode-server tarball
+HASH=$(curl https://update.code.visualstudio.com/api/commits/stable/server-linux-x64-web | cut -d '"' -f 2)
+output=$(wget -O- https://az764295.vo.msecnd.net/stable/$HASH/vscode-server-linux-x64-web.tar.gz | tar -xz -C ${INSTALL_DIR} --strip-components=1 >/dev/null 2>&1)
+if [ $? -ne 0 ]; then
+  echo "Failed to install vscode-server: $output"
+  exit 1
+fi
+printf "🥳 vscode-server has been installed.\n\n"
+
+echo "👷 Running ${INSTALL_DIR}/bin/code serve-web --port ${PORT} --without-connection-token --accept-server-license-terms in the background..."
+echo "Check logs at ${LOG_PATH}!"
+${INSTALL_DIR}/bin/code-server serve-local --port ${PORT} --without-connection-token --accept-server-license-terms >${LOG_PATH} 2>&1 &

vscode-web/run.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env sh
-
-BOLD='\033[0;1m'
-
-# Check if VS Code is installed
-if [ ! -d "${INSTALL_DIR}" ]; then
-  printf "$${BOLD} Installing VS Code!\n"
-  # Download and extract VS Code tarball
-  output=$(curl -L "https://update.code.visualstudio.com/latest/linux-x64/stable" -o /tmp/code.tar.gz &&
-    mkdir -p ${INSTALL_DIR} &&
-    tar -xzf /tmp/code.tar.gz -C ${INSTALL_DIR} --strip-components=1)
-  if [ $? -ne 0 ]; then
-    echo "Failed to install VS Code: $output"
-    exit 1
-  fi
-  printf "🥳 VS code has been installed.\n\n"
-else
-  printf "🥳 VS code is already installed.\n\n"
-fi
-
-echo "👷 Running code serve-web in the background..."
-echo "Check logs at ${LOG_PATH}!"
-${INSTALL_DIR}/bin/code serve-web --port ${PORT} --without-connection-token --accept-server-license-terms >${LOG_PATH} 2>&1 &