diff --git a/README.md b/README.md index b58412b..6ccc29e 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,10 @@ Container feature that also doesn't support Alpine. - [gcx](src/gcx/README.md) – installs `gcx` directly from upstream https://github.com/grafana/gcx binary releases. -- [grafanactl](src/grafanactl/README.md) – installs `grafanactl` directly from - upstream https://github.com/grafana/grafanactl binary releases. +- (deprecated) [grafanactl](src/grafanactl/README.md) – installs `grafanactl` + directly from upstream https://github.com/grafana/grafanactl binary releases. + Use the [gcx](src/gcx/README.md) feature instead as upstream `grafanactl` is + no longer maintained and replaced by `gcx`. - [gocover](src/gocover/README.md) – provides a `gocover` command to run conveniently unit tests and update a README.md coverage badge, supporting a @@ -74,6 +76,9 @@ Container feature that also doesn't support Alpine. - [nerdctl](src/nerdctl/README.md) – installs `nerdctl` directly from upstream https://github.com/containerd/nerdctl binary releases. +- [pinact](src/pinact/README.md) – installs `pinact` directly from upstream + https://github.com/suzuki-shunsuke/pinact binary releases. + - [pin-github-action](src/pin-github-action/README.md) – provides mheaps's `pin-github-action` for pinning GitHub actions to specific hashes. diff --git a/src/bpftool/devcontainer-feature.json b/src/bpftool/devcontainer-feature.json index 1d76853..63803f7 100644 --- a/src/bpftool/devcontainer-feature.json +++ b/src/bpftool/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "bpftool", "id": "bpftool", - "version": "0.0.4", + "version": "0.0.5", "description": "Installs bpftool binary from upstream https://github.com/libbpf/bpftool binary releases.", "options": { "version": { diff --git a/src/bpftool/install.sh b/src/bpftool/install.sh index 14d2327..14feea9 100755 --- a/src/bpftool/install.sh +++ b/src/bpftool/install.sh @@ -158,7 +158,7 @@ fi if [ "$BPFTOOL_VERSION" = "latest" ]; then # get latest release - BPFTOOL_VERSION=$(curl -s ${QUERYLATEST_URL} | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + BPFTOOL_VERSION=$(curl -s ${QUERYLATEST_URL} | grep -m1 '"tag_name":' | sed -E 's/.*"tag_name": *"([^"]+)".*/\1/') fi echo "installing bpftool version: ${BPFTOOL_VERSION}" diff --git a/src/cni-plugins/devcontainer-feature.json b/src/cni-plugins/devcontainer-feature.json index 5ba86ea..08a8f06 100644 --- a/src/cni-plugins/devcontainer-feature.json +++ b/src/cni-plugins/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "CNI Plugins", "id": "cni-plugins", - "version": "0.0.1", + "version": "0.0.2", "description": "Installs CNI plugins from upstream.", "options": { "version": { diff --git a/src/cni-plugins/install.sh b/src/cni-plugins/install.sh index 4d9f865..7afe215 100755 --- a/src/cni-plugins/install.sh +++ b/src/cni-plugins/install.sh @@ -142,7 +142,7 @@ fi if [ "$CNIPLUGINS_VERSION" = "latest" ]; then # get latest release - CNIPLUGINS_VERSION=$(curl -s ${QUERYLATEST_URL} | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + CNIPLUGINS_VERSION=$(curl -s ${QUERYLATEST_URL} | grep -m1 '"tag_name":' | sed -E 's/.*"tag_name": *"([^"]+)".*/\1/') fi echo version: $CNIPLUGINS_VERSION diff --git a/src/gcx/devcontainer-feature.json b/src/gcx/devcontainer-feature.json index 05bcef6..43a4a45 100644 --- a/src/gcx/devcontainer-feature.json +++ b/src/gcx/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "gcx", "id": "gcx", - "version": "0.0.1", + "version": "0.0.2", "description": "Installs Grafana gcx CLI from upstream https://github.com/grafana/gcx binary releases.", "options": { "version": { diff --git a/src/gcx/install.sh b/src/gcx/install.sh index c0c4aaf..843c261 100755 --- a/src/gcx/install.sh +++ b/src/gcx/install.sh @@ -158,7 +158,7 @@ fi if [ "$GCX_VERSION" = "latest" ]; then # get latest release - GCX_VERSION=$(curl -s ${QUERYLATEST_URL} | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + GCX_VERSION=$(curl -s ${QUERYLATEST_URL} | grep -m1 '"tag_name":' | sed -E 's/.*"tag_name": *"([^"]+)".*/\1/') fi echo "installing gcx version: ${GCX_VERSION}" diff --git a/src/grafanactl/devcontainer-feature.json b/src/grafanactl/devcontainer-feature.json index 0628f0e..9f6fde6 100644 --- a/src/grafanactl/devcontainer-feature.json +++ b/src/grafanactl/devcontainer-feature.json @@ -1,7 +1,8 @@ { "name": "grafanactl", "id": "grafanactl", - "version": "0.0.2", + "deprecated": true, + "version": "0.0.3", "description": "Installs grafanactl from upstream https://github.com/grafana/grafanactl binary releases.", "options": { "version": { diff --git a/src/grafanactl/install.sh b/src/grafanactl/install.sh index 4b7b1c7..5badb8e 100755 --- a/src/grafanactl/install.sh +++ b/src/grafanactl/install.sh @@ -158,7 +158,7 @@ fi if [ "$GRAFANACTL_VERSION" = "latest" ]; then # get latest release - GRAFANACTL_VERSION=$(curl -s ${QUERYLATEST_URL} | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + GRAFANACTL_VERSION=$(curl -s ${QUERYLATEST_URL} | grep -m1 '"tag_name":' | sed -E 's/.*"tag_name": *"([^"]+)".*/\1/') fi echo "installing grafanactl version: ${GRAFANACTL_VERSION}" diff --git a/src/lazygit/devcontainer-feature.json b/src/lazygit/devcontainer-feature.json index 2cb1ca3..05b3170 100644 --- a/src/lazygit/devcontainer-feature.json +++ b/src/lazygit/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "lazygit", "id": "lazygit", - "version": "0.0.1", + "version": "0.0.2", "description": "Installs lazygit from upstream https://github.com/jesseduffield/lazygit binary releases.", "options": { "version": { diff --git a/src/lazygit/install.sh b/src/lazygit/install.sh index 8a5a504..251685f 100755 --- a/src/lazygit/install.sh +++ b/src/lazygit/install.sh @@ -158,7 +158,7 @@ fi if [ "$LAZYGIT_VERSION" = "latest" ]; then # get latest release - LAZYGIT_VERSION=$(curl -s ${QUERYLATEST_URL} | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + LAZYGIT_VERSION=$(curl -s ${QUERYLATEST_URL} | grep -m1 '"tag_name":' | sed -E 's/.*"tag_name": *"([^"]+)".*/\1/') fi echo "installing lazygit version: ${LAZYGIT_VERSION}" diff --git a/src/nerdctl/devcontainer-feature.json b/src/nerdctl/devcontainer-feature.json index 01dbdb3..5a229a2 100644 --- a/src/nerdctl/devcontainer-feature.json +++ b/src/nerdctl/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "nerdctl containerd control CLI and CNI plugins", "id": "nerdctl", - "version": "0.1.0", + "version": "0.1.1", "description": "Installs nerdctl and CNI plugins from upstream.", "options": { "version": { diff --git a/src/nerdctl/install.sh b/src/nerdctl/install.sh index fed5c3b..bb64ea0 100755 --- a/src/nerdctl/install.sh +++ b/src/nerdctl/install.sh @@ -144,9 +144,7 @@ fi if [ "$NERDCTL_VERSION" = "latest" ]; then # get latest release - NERDCTL_VERSION=$(curl -s ${QUERYLATEST_URL} \ - | grep '"tag_name":' \ - | sed -E 's/.*"([^"]+)".*/\1/') + NERDCTL_VERSION=$(curl -s ${QUERYLATEST_URL} | grep -m1 '"tag_name":' | sed -E 's/.*"tag_name": *"([^"]+)".*/\1/') fi echo "version: ${NERDCTL_VERSION}" diff --git a/src/pinact/devcontainer-feature.json b/src/pinact/devcontainer-feature.json index 17dabf6..668647b 100644 --- a/src/pinact/devcontainer-feature.json +++ b/src/pinact/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "pinact", "id": "pinact", - "version": "0.0.1", + "version": "0.0.2", "description": "Installs pinact from upstream https://github.com/suzuki-shunsuke/pinact binary releases.", "options": { "version": { diff --git a/src/pinact/install.sh b/src/pinact/install.sh index bf49795..2208419 100755 --- a/src/pinact/install.sh +++ b/src/pinact/install.sh @@ -158,7 +158,7 @@ fi if [ "$PINACT_VERSION" = "latest" ]; then # get latest release - PINACT_VERSION=$(curl -s ${QUERYLATEST_URL} | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + PINACT_VERSION=$(curl -s ${QUERYLATEST_URL} | grep -m1 '"tag_name":' | sed -E 's/.*"tag_name": *"([^"]+)".*/\1/') fi echo "installing pinact version: ${PINACT_VERSION}"