Skip to content

Commit 13bd520

Browse files
committed
Migrate personal setup back to bash
Fish isn't quite working out for me, so remove it from the personal setup feature and add `fzf` for fuzzy searching.
1 parent cf1ae85 commit 13bd520

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/personal-setup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Sets up my desired software and configuration for any devcontainer environment.
77

88
```json
99
"features": {
10-
"ghcr.io/csutter/devcontainer-features/personal-setup:2": {}
10+
"ghcr.io/csutter/devcontainer-features/personal-setup:3": {}
1111
}
1212
```
1313

src/personal-setup/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "personal-setup",
3-
"version": "2.0.0",
3+
"version": "3.0.0",
44
"name": "Personal Setup",
55
"description": "Sets up my desired software and configuration for any devcontainer environment.",
66
"mounts": [

src/personal-setup/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ echo "Installing packages for distribution: $ID"
1212
case "$ID" in
1313
debian|ubuntu)
1414
apt-get update
15-
apt-get install -y fish git-delta rcm tree openssh-client
15+
apt-get install -y fzf git-delta rcm tree openssh-client
1616
;;
1717
fedora)
18-
dnf install -y fish git-delta rcm tree openssh-clients
18+
dnf install -y fzf git-delta rcm tree openssh-clients
1919
;;
2020
*)
2121
echo "Error: Unsupported distribution: $ID"

test/personal-setup/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ set -e
33

44
source dev-container-features-test-lib
55

6-
check "delta is available" bash -c "which delta"
7-
check "fish is available" bash -c "which fish"
6+
check "delta is available" bash -c "which delta"
7+
check "fzf is available" bash -c "which fzf"
88
check "rcm is available" bash -c "which rcup"
9-
check "tree is available" bash -c "which tree"
109
check "ssh is available" bash -c "which ssh"
10+
check "tree is available" bash -c "which tree"
1111
# Use a dotfile that should _always_ be present on any system
1212
check "dotfiles are installed" bash -c "test -f $HOME/.config/fish/config.fish"
1313
check "rcrc is present" bash -c "test -f /etc/rcrc"

0 commit comments

Comments
 (0)