diff --git a/src/personal-setup/README.md b/src/personal-setup/README.md index d9e15f2..ac74a94 100644 --- a/src/personal-setup/README.md +++ b/src/personal-setup/README.md @@ -7,7 +7,7 @@ Sets up my desired software and configuration for any devcontainer environment. ```json "features": { - "ghcr.io/csutter/devcontainer-features/personal-setup:2": {} + "ghcr.io/csutter/devcontainer-features/personal-setup:3": {} } ``` diff --git a/src/personal-setup/devcontainer-feature.json b/src/personal-setup/devcontainer-feature.json index d29f24e..ead3ee7 100644 --- a/src/personal-setup/devcontainer-feature.json +++ b/src/personal-setup/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "personal-setup", - "version": "2.0.0", + "version": "3.0.0", "name": "Personal Setup", "description": "Sets up my desired software and configuration for any devcontainer environment.", "mounts": [ diff --git a/src/personal-setup/install.sh b/src/personal-setup/install.sh index 65b2ba5..f525bcb 100755 --- a/src/personal-setup/install.sh +++ b/src/personal-setup/install.sh @@ -12,10 +12,10 @@ echo "Installing packages for distribution: $ID" case "$ID" in debian|ubuntu) apt-get update - apt-get install -y fish git-delta rcm tree openssh-client + apt-get install -y fzf git-delta rcm tree openssh-client ;; fedora) - dnf install -y fish git-delta rcm tree openssh-clients + dnf install -y fzf git-delta rcm tree openssh-clients ;; *) echo "Error: Unsupported distribution: $ID" diff --git a/test/personal-setup/test.sh b/test/personal-setup/test.sh index 94d8b7a..98e8f9f 100755 --- a/test/personal-setup/test.sh +++ b/test/personal-setup/test.sh @@ -3,11 +3,11 @@ set -e source dev-container-features-test-lib -check "delta is available" bash -c "which delta" -check "fish is available" bash -c "which fish" +check "delta is available" bash -c "which delta" +check "fzf is available" bash -c "which fzf" check "rcm is available" bash -c "which rcup" -check "tree is available" bash -c "which tree" check "ssh is available" bash -c "which ssh" +check "tree is available" bash -c "which tree" # Use a dotfile that should _always_ be present on any system check "dotfiles are installed" bash -c "test -f $HOME/.config/fish/config.fish" check "rcrc is present" bash -c "test -f /etc/rcrc"