Update postCreateCommand (#43)

microsoft · Oct 10, 2023 · 2eca587 · 2eca587
1 parent 6a6cb47
commit 2eca587
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/src/devtool/devcontainer-feature.json b/src/devtool/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "DevTool",
     "id": "devtool",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Install DevTool",
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
@@ -13,5 +13,5 @@
             ]
         }
     },
-    "postCreateCommand": "curl -sL https://aka.ms/InstallToolLinux.sh | sh -s DevTool"
+    "postCreateCommand": "/usr/local/share/install-devtool.sh"
 }
diff --git a/src/devtool/install.sh b/src/devtool/install.sh
@@ -37,4 +37,31 @@ else
     check_packages curl ca-certificates xdg-utils
 fi
 
+# --- Generate a 'install-devtool.sh' script to be executed by the 'postCreateCommand' lifecycle hook
+DEVTOOL_SCRIPT_PATH="/usr/local/share/install-devtool.sh"
+
+tee "$DEVTOOL_SCRIPT_PATH" > /dev/null \
+<< EOF
+#!/bin/bash
+set -e
+EOF
+
+tee -a "$DEVTOOL_SCRIPT_PATH" > /dev/null \
+<< 'EOF'
+
+echo "Installing DevTool..."
+# Wait up to 3 minutes for the ado-auth-helper to be installed
+for i in {1..180}; do
+    if [ -f ${HOME}/ado-auth-helper ]; then
+        break
+    fi
+    sleep 1
+done
+
+cd /tmp
+curl -sL https://aka.ms/InstallToolLinux.sh | sh -s DevTool
+EOF
+
+chmod 755 "$DEVTOOL_SCRIPT_PATH"
+
 exit 0
diff --git a/test/devtool/test.sh b/test/devtool/test.sh
@@ -6,7 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Feature-specific tests
-check "dev" dev --version
+check "devtool" cat /usr/local/share/install-devtool.sh
 
 
 # Report results