From 363c3de22198979a769d33785fc30847b73a7ff0 Mon Sep 17 00:00:00 2001
From: Mark Phippard <markphip@gmail.com>
Date: Tue, 10 Oct 2023 15:37:53 -0400
Subject: [PATCH 1/3] Add tests for DevTool

Do not expect they will pass due to internal requirement
---
 .github/workflows/test-all.yaml |  1 +
 .github/workflows/test-pr.yaml  |  1 +
 test/devtool/test.sh            | 14 ++++++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 test/devtool/test.sh

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index eedf0be..d60e406 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -13,6 +13,7 @@ jobs:
       matrix:
         features:
           - artifacts-helper
+          - devtool
           - docfx
           - external-repository        
           - microsoft-git
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 2ff276b..2328ac9 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -16,6 +16,7 @@ jobs:
         with:
           filters: |
             artifacts-helper: ./**/artifacts-helper/**
+            devtool: ./**/devtool/**
             docfx: ./**/docfx/**
             external-repository: ./**/external-repository/**
             microsoft-git: ./**/microsoft-git/**
diff --git a/test/devtool/test.sh b/test/devtool/test.sh
new file mode 100644
index 0000000..b57d762
--- /dev/null
+++ b/test/devtool/test.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+# Feature-specific tests
+check "dev" dev --version
+
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file

From 691b3970c6d399d421fc9c3f3c1c4f35378f0d14 Mon Sep 17 00:00:00 2001
From: Mark Phippard <markphip@gmail.com>
Date: Tue, 10 Oct 2023 15:46:55 -0400
Subject: [PATCH 2/3] Fix weird character

---
 src/devtool/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devtool/devcontainer-feature.json b/src/devtool/devcontainer-feature.json
index 42a8ada..2408a9e 100644
--- a/src/devtool/devcontainer-feature.json
+++ b/src/devtool/devcontainer-feature.json
@@ -13,5 +13,5 @@
             ]
         }
     },
-    "postCreateCommand": "curl –sL https://aka.ms/InstallToolLinux.sh | sh -s DevTool​"    
+    "postCreateCommand": "curl -sL https://aka.ms/InstallToolLinux.sh | sh -s DevTool"
 }

From 3db177bdec9709e65cfc343f796291294c418d78 Mon Sep 17 00:00:00 2001
From: Mark Phippard <markphip@gmail.com>
Date: Tue, 10 Oct 2023 15:52:29 -0400
Subject: [PATCH 3/3] Install tar on Mariner

---
 src/devtool/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devtool/install.sh b/src/devtool/install.sh
index 2f51d1d..a6838b0 100644
--- a/src/devtool/install.sh
+++ b/src/devtool/install.sh
@@ -31,7 +31,7 @@ check_packages() {
 export DEBIAN_FRONTEND=noninteractive
 
 if [ "${ID}" = "mariner" ]; then
-    tdnf install -y curl ca-certificates
+    tdnf install -y curl ca-certificates tar
     tdnf clean all
 else
     check_packages curl ca-certificates xdg-utils