From 151cb234b0dee0e1ad3d1901433f0a39b4077f68 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 18:58:26 +0000 Subject: [PATCH 01/19] testing array reading --- code-server/run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code-server/run.sh b/code-server/run.sh index 6676aaa..ba23451 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -EXTENSIONS=("${EXTENSIONS}") +# EXTENSIONS=("${EXTENSIONS}") +EXTENSIONS=',' read -ra arr <<< "${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' From 972b5b82826658c321afabf2be142b55eccff6f6 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:01:31 +0000 Subject: [PATCH 02/19] debugging arr --- code-server/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code-server/run.sh b/code-server/run.sh index ba23451..667e9cf 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -8,6 +8,8 @@ RESET='\033[0m' printf "$${BOLD}Installing code-server!\n" +printf "$${BOLD}extensions: $${EXTENSIONS}!\n" + ARGS=( "--method=standalone" "--prefix=${INSTALL_PREFIX}" From c85bf5db4fc5b6b138435c8e901dd5e58499894e Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:13:52 +0000 Subject: [PATCH 03/19] printing arr --- code-server/run.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index 667e9cf..ee9dfc0 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,14 +1,18 @@ #!/usr/bin/env bash # EXTENSIONS=("${EXTENSIONS}") -EXTENSIONS=',' read -ra arr <<< "${EXTENSIONS}" +EXTENSIONS=',' read -ra arr <<< "$EXTENSIONS" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' printf "$${BOLD}Installing code-server!\n" -printf "$${BOLD}extensions: $${EXTENSIONS}!\n" +# printf "$${BOLD}extensions: $${EXTENSIONS}\n" + +for ext in "$${EXTENSIONS[@]}"; do + printf "$${BOLD}extension: $${ext}\n" +done ARGS=( "--method=standalone" From 8fac468bb4f7fe00fef255ddb32a18a80e920f1f Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:18:46 +0000 Subject: [PATCH 04/19] printing arr --- code-server/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index ee9dfc0..e1dcfe7 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# EXTENSIONS=("${EXTENSIONS}") -EXTENSIONS=',' read -ra arr <<< "$EXTENSIONS" +EXTENSIONS=("${EXTENSIONS}") +EXTENSIONS=',' read -ra arr <<< "$${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' From 03a4cc01be80c7976934da2882864c719d9b37d7 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:20:52 +0000 Subject: [PATCH 05/19] array IFS --- code-server/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-server/run.sh b/code-server/run.sh index e1dcfe7..83542aa 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash EXTENSIONS=("${EXTENSIONS}") -EXTENSIONS=',' read -ra arr <<< "$${EXTENSIONS}" +IFS=',' read -ra arr <<< "$${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' From 7fa87d3074dc4d62e5f594b3c12ef96d534be316 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:25:14 +0000 Subject: [PATCH 06/19] naming fix --- code-server/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index 83542aa..4efb962 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash EXTENSIONS=("${EXTENSIONS}") -IFS=',' read -ra arr <<< "$${EXTENSIONS}" +IFS=',' read -ra EXTENSIONS <<< "$${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' @@ -10,7 +10,7 @@ printf "$${BOLD}Installing code-server!\n" # printf "$${BOLD}extensions: $${EXTENSIONS}\n" -for ext in "$${EXTENSIONS[@]}"; do +for ext in "${EXTENSIONS[@]}"; do printf "$${BOLD}extension: $${ext}\n" done From 7f4da980d1c31a6fa229d470ef4e599f94b0341c Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:25:45 +0000 Subject: [PATCH 07/19] naming fix --- code-server/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index 4efb962..70f8d8d 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash EXTENSIONS=("${EXTENSIONS}") -IFS=',' read -ra EXTENSIONS <<< "$${EXTENSIONS}" +IFS=',' read -ra extarr <<< "$${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' @@ -10,7 +10,7 @@ printf "$${BOLD}Installing code-server!\n" # printf "$${BOLD}extensions: $${EXTENSIONS}\n" -for ext in "${EXTENSIONS[@]}"; do +for ext in "${extarr[@]}"; do printf "$${BOLD}extension: $${ext}\n" done From 71d7ba80a56ec99895163f4942e9da74fbaa072f Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:26:29 +0000 Subject: [PATCH 08/19] naming fix --- code-server/run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index 70f8d8d..40a2b48 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -EXTENSIONS=("${EXTENSIONS}") -IFS=',' read -ra extarr <<< "$${EXTENSIONS}" +# EXTENSIONS=("${EXTENSIONS}") +IFS=',' read -ra arr <<< "$EXTENSIONS" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' @@ -10,7 +10,7 @@ printf "$${BOLD}Installing code-server!\n" # printf "$${BOLD}extensions: $${EXTENSIONS}\n" -for ext in "${extarr[@]}"; do +for ext in "${arr[@]}"; do printf "$${BOLD}extension: $${ext}\n" done From 54fc306a95b213667a84cfdd6b46287fe1f59896 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:26:55 +0000 Subject: [PATCH 09/19] naming fix --- code-server/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index 40a2b48..d02ca15 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# EXTENSIONS=("${EXTENSIONS}") -IFS=',' read -ra arr <<< "$EXTENSIONS" +EXTENSIONS=("${EXTENSIONS}") +IFS=',' read -ra arr <<< "$${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' From c47cf97fd9314fee01428aab667f1dec6c5cbc5b Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:28:01 +0000 Subject: [PATCH 10/19] naming fix --- code-server/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index d02ca15..abf383f 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash EXTENSIONS=("${EXTENSIONS}") -IFS=',' read -ra arr <<< "$${EXTENSIONS}" +# IFS=',' read -ra exts <<< "$${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' @@ -10,7 +10,7 @@ printf "$${BOLD}Installing code-server!\n" # printf "$${BOLD}extensions: $${EXTENSIONS}\n" -for ext in "${arr[@]}"; do +for ext in "${exts[@]}"; do printf "$${BOLD}extension: $${ext}\n" done From 1a71239436c23d84a3996a8ccef306bc1338d7e3 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:29:36 +0000 Subject: [PATCH 11/19] invalid character debug --- code-server/main.tf | 1 + code-server/run.sh | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code-server/main.tf b/code-server/main.tf index 837f0db..65f934f 100644 --- a/code-server/main.tf +++ b/code-server/main.tf @@ -66,6 +66,7 @@ resource "coder_script" "code-server" { agent_id = var.agent_id display_name = "code-server" icon = "/icon/code.svg" + shell = "bash" script = templatefile("${path.module}/run.sh", { VERSION : var.install_version, EXTENSIONS : join(",", var.extensions), diff --git a/code-server/run.sh b/code-server/run.sh index abf383f..aec5edd 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -8,11 +8,9 @@ RESET='\033[0m' printf "$${BOLD}Installing code-server!\n" -# printf "$${BOLD}extensions: $${EXTENSIONS}\n" - -for ext in "${exts[@]}"; do - printf "$${BOLD}extension: $${ext}\n" -done +# for ext in "${exts[@]}"; do +# printf "$${BOLD}extension: $${ext}\n" +# done ARGS=( "--method=standalone" From f5b7df46f286d087949ae67fa0e0f5b03afa5fe8 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:30:25 +0000 Subject: [PATCH 12/19] removed shell --- code-server/main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/code-server/main.tf b/code-server/main.tf index 65f934f..837f0db 100644 --- a/code-server/main.tf +++ b/code-server/main.tf @@ -66,7 +66,6 @@ resource "coder_script" "code-server" { agent_id = var.agent_id display_name = "code-server" icon = "/icon/code.svg" - shell = "bash" script = templatefile("${path.module}/run.sh", { VERSION : var.install_version, EXTENSIONS : join(",", var.extensions), From 1745c534ed0904a61f274386de141f1618df3604 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:32:24 +0000 Subject: [PATCH 13/19] complete reversion --- code-server/run.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index aec5edd..aa309a5 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -1,17 +1,12 @@ #!/usr/bin/env bash EXTENSIONS=("${EXTENSIONS}") -# IFS=',' read -ra exts <<< "$${EXTENSIONS}" BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' printf "$${BOLD}Installing code-server!\n" -# for ext in "${exts[@]}"; do -# printf "$${BOLD}extension: $${ext}\n" -# done - ARGS=( "--method=standalone" "--prefix=${INSTALL_PREFIX}" @@ -51,4 +46,4 @@ fi echo "👷 Running code-server in the background..." echo "Check logs at ${LOG_PATH}!" -$CODE_SERVER --auth none --port ${PORT} >${LOG_PATH} 2>&1 & +$CODE_SERVER --auth none --port ${PORT} >${LOG_PATH} 2>&1 & \ No newline at end of file From 8918d8aef5db86b23a86bf86ec5eb8d2af67e45e Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:35:26 +0000 Subject: [PATCH 14/19] arr printing --- code-server/run.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code-server/run.sh b/code-server/run.sh index aa309a5..4c25ba0 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -5,6 +5,12 @@ BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' +IFS=',' read -ra arr <<< "$names" + +for i in "${arr[@]}"; do + echo " h: $i" +done + printf "$${BOLD}Installing code-server!\n" ARGS=( From 7d4723336e6d721f5db2cd92150786a9b93a465c Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:36:13 +0000 Subject: [PATCH 15/19] arr printing --- code-server/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index 4c25ba0..d8fccc8 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -5,9 +5,9 @@ BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' -IFS=',' read -ra arr <<< "$names" +IFS=',' read -r -a extArr <<< "$EXTENSIONS" -for i in "${arr[@]}"; do +for i in "${extArr[@]}"; do echo " h: $i" done From 7b71f610e542c43628eeb066534582935d73e90e Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:37:40 +0000 Subject: [PATCH 16/19] arr printing --- code-server/run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code-server/run.sh b/code-server/run.sh index d8fccc8..39e1e7c 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -5,7 +5,9 @@ BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' -IFS=',' read -r -a extArr <<< "$EXTENSIONS" +printf "ext string$${EXTENSIONS}" + +IFS=',' read -r -a extArr <<< "$${EXTENSIONS}" for i in "${extArr[@]}"; do echo " h: $i" From b04683ca4c0cb4a66597f3ff2a87096f783890ae Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:38:20 +0000 Subject: [PATCH 17/19] arr printing --- code-server/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-server/run.sh b/code-server/run.sh index 39e1e7c..fe7a7dd 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -9,7 +9,7 @@ printf "ext string$${EXTENSIONS}" IFS=',' read -r -a extArr <<< "$${EXTENSIONS}" -for i in "${extArr[@]}"; do +for i in "$${extArr[@]}"; do echo " h: $i" done From 93965edc973e732223b70af984fbdb81837ab3e2 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:39:30 +0000 Subject: [PATCH 18/19] applied array changes --- code-server/run.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code-server/run.sh b/code-server/run.sh index fe7a7dd..552ced1 100755 --- a/code-server/run.sh +++ b/code-server/run.sh @@ -5,14 +5,6 @@ BOLD='\033[0;1m' CODE='\033[36;40;1m' RESET='\033[0m' -printf "ext string$${EXTENSIONS}" - -IFS=',' read -r -a extArr <<< "$${EXTENSIONS}" - -for i in "$${extArr[@]}"; do - echo " h: $i" -done - printf "$${BOLD}Installing code-server!\n" ARGS=( @@ -33,7 +25,8 @@ printf "🥳 code-server has been installed in ${INSTALL_PREFIX}\n\n" CODE_SERVER="${INSTALL_PREFIX}/bin/code-server" # Install each extension... -for extension in "$${EXTENSIONS[@]}"; do +IFS=',' read -r -a EXTENSIONLIST <<< "$${EXTENSIONS}" +for extension in "$${EXTENSIONLIST[@]}"; do if [ -z "$extension" ]; then continue fi From eaf6fae789b322a6f5b258d17aba21567f2a7be9 Mon Sep 17 00:00:00 2001 From: Stephen Kirby Date: Fri, 13 Oct 2023 19:43:18 +0000 Subject: [PATCH 19/19] added readme block --- code-server/README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code-server/README.md b/code-server/README.md index 302a1ea..ca076df 100644 --- a/code-server/README.md +++ b/code-server/README.md @@ -63,6 +63,18 @@ module "settings" { } ``` +### Install multiple extensions + +Just run code-server in the background, don't fetch it from GitHub: + +```hcl +module "settings" { + source = "https://registry.coder.com/modules/code-server" + agent_id = coder_agent.example.id + extensions = [ "dracula-theme.theme-dracula", "ms-azuretools.vscode-docker" ] +} +``` + ### Offline Mode Just run code-server in the background, don't fetch it from GitHub: