From dd3cc6a862e5264d766167e44d3c00cf75651d2f Mon Sep 17 00:00:00 2001 From: Conor Behard Roberts Date: Fri, 19 Jan 2024 19:28:19 +0000 Subject: [PATCH 1/3] Update main.tf --- git-clone/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-clone/main.tf b/git-clone/main.tf index 110232fa..80b2cc1f 100644 --- a/git-clone/main.tf +++ b/git-clone/main.tf @@ -28,7 +28,7 @@ variable "agent_id" { resource "coder_script" "git_clone" { agent_id = var.agent_id script = templatefile("${path.module}/run.sh", { - CLONE_PATH : var.path != "" ? var.path : join("/", ["~", basename(var.url)]), + CLONE_PATH : var.path != "" ? join("/", [var.path, basename(var.url)]) : join("/", ["~", basename(var.url)]) REPO_URL : var.url, }) display_name = "Git Clone" From a04ecd62b672567c9800dc9e76de0649a3a5e5b5 Mon Sep 17 00:00:00 2001 From: Conor Behard Roberts Date: Fri, 19 Jan 2024 19:33:16 +0000 Subject: [PATCH 2/3] remove git --- git-clone/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-clone/main.tf b/git-clone/main.tf index 80b2cc1f..75618914 100644 --- a/git-clone/main.tf +++ b/git-clone/main.tf @@ -28,7 +28,7 @@ variable "agent_id" { resource "coder_script" "git_clone" { agent_id = var.agent_id script = templatefile("${path.module}/run.sh", { - CLONE_PATH : var.path != "" ? join("/", [var.path, basename(var.url)]) : join("/", ["~", basename(var.url)]) + clone_path = var.path != "" ? join("/", [var.path, replace(basename(var.url), ".git", "")]) : join("/", ["~", replace(basename(var.url), ".git", "")]) REPO_URL : var.url, }) display_name = "Git Clone" From d41a15ae7d8cb21e18782f74945c05b82f768c23 Mon Sep 17 00:00:00 2001 From: Conor Behard Roberts Date: Fri, 19 Jan 2024 19:34:10 +0000 Subject: [PATCH 3/3] rename clonepath --- git-clone/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-clone/main.tf b/git-clone/main.tf index 75618914..4f32232d 100644 --- a/git-clone/main.tf +++ b/git-clone/main.tf @@ -28,7 +28,7 @@ variable "agent_id" { resource "coder_script" "git_clone" { agent_id = var.agent_id script = templatefile("${path.module}/run.sh", { - clone_path = var.path != "" ? join("/", [var.path, replace(basename(var.url), ".git", "")]) : join("/", ["~", replace(basename(var.url), ".git", "")]) + CLONE_PATH = var.path != "" ? join("/", [var.path, replace(basename(var.url), ".git", "")]) : join("/", ["~", replace(basename(var.url), ".git", "")]) REPO_URL : var.url, }) display_name = "Git Clone"