Maybe xz-tools might not be installed

CargoSense · Feb 29, 2024 · 7d790e1 · 7d790e1
1 parent d10303d
commit 7d790e1
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 3 deletions.
diff --git a/src/redis-cli/README.md b/src/redis-cli/README.md
@@ -0,0 +1,21 @@
+# redis-cli
+
+Install the [Redis command line utility](https://redis.io/docs/connect/cli/).
+
+## Usage
+
+```json
+"features": {
+  "ghcr.io/CargoSense/devcontainer-features/redis-cli:1": {}
+}
+```
+
+## Options
+
+| Option ID | Description                       | Type   | Default Value |
+|:----------|:----------------------------------|:-------|:--------------|
+| `version` | The redis-cli version to install. | string | `os-provided` |
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu and Linux distributions using the [apt](https://wiki.debian.org/AptCLI) management tool.
diff --git a/src/redis-cli/devcontainer-feature.json b/src/redis-cli/devcontainer-feature.json
@@ -0,0 +1,19 @@
+{
+  "name": "Redis CLI",
+  "id": "redis-cli",
+  "version": "1.0.0",
+  "description": "Install the Redis command line utility.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "os-provided"
+      ],
+      "default": "os-provided",
+      "description": "Select or enter a Redis CLI version."
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
+}
diff --git a/src/redis-cli/install.sh b/src/redis-cli/install.sh
diff --git a/src/shellcheck/install.sh b/src/shellcheck/install.sh
@@ -22,7 +22,7 @@ curl_installed=""
 
 if ! type curl >/dev/null 2>&1; then
   apt update --yes
-  apt install --no-install-recommends --yes curl ca-certificates
+  apt install --no-install-recommends --yes curl ca-certificates xz-utils
 
   curl_installed="true"
 fi
@@ -43,10 +43,11 @@ case "${machine}" in
 esac
 
 # https://github.com/koalaman/shellcheck/releases/download/v0.9.0/shellcheck-v0.9.0.linux.aarch64.tar.xz
-url="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.${arch}.tar.xz"
+file="shellcheck-v${SHELLCHECK_VERSION}.linux.${arch}.tar.xz"
+url="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${file}"
 
 curl -sSL "${url}" | tar --strip-components=1 -Jxvf - -C "${INSTALL_PATH}" "shellcheck-v${SHELLCHECK_VERSION}/shellcheck"
 
 if [ -n "${curl_installed}" ]; then
-  apt purge curl --autoremove --yes
+  apt purge curl xz-utils --autoremove --yes
 fi