diff --git a/src/personal-setup/devcontainer-feature.json b/src/personal-setup/devcontainer-feature.json index 142bb3d..d11ebc5 100644 --- a/src/personal-setup/devcontainer-feature.json +++ b/src/personal-setup/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "personal-setup", - "version": "4.1.0", + "version": "4.2.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 027476c..7de8a9c 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 curl fd-find fish git-delta jq less openssh-client rcm ripgrep tree ;; fedora) - dnf install -y fish git-delta rcm tree openssh-clients + dnf install -y curl fd-find fish git-delta jq less openssh-clients rcm ripgrep tree ;; *) echo "Error: Unsupported distribution: $ID" diff --git a/test/personal-setup/test.sh b/test/personal-setup/test.sh index 37c74bf..46f8fe3 100755 --- a/test/personal-setup/test.sh +++ b/test/personal-setup/test.sh @@ -3,13 +3,22 @@ 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 "rcm is available" bash -c "which rcup" -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 packages are installed and available +check "curl is available" bash -c "which curl" +check "delta is available" bash -c "which delta" +check "fd is available" bash -c "which fd || which fdfind" +check "fish is available" bash -c "which fish" +check "jq is available" bash -c "which jq" +check "less is available" bash -c "which less" +check "rcm is available" bash -c "which rcup" +check "ripgrep is available" bash -c "which rg" +check "ssh is available" bash -c "which ssh" +check "tree is available" bash -c "which tree" + +# Check dotfiles are installed check "dotfiles are installed" bash -c "test -f $HOME/.rcrc" + +# Check environment variables are set check "_IS_DEVCONTAINER is set" bash -c "test \"\$_IS_DEVCONTAINER\" = \"true\"" check "PROMPT_PREFIX is set" bash -c "test \"\$PROMPT_PREFIX\" = \"\""