Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/personal-setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Sets up my desired software and configuration for any devcontainer environment.

```json
"features": {
"ghcr.io/csutter/devcontainer-features/personal-setup:4": {}
"ghcr.io/csutter/devcontainer-features/personal-setup:5": {}
}
```

Expand Down
4 changes: 2 additions & 2 deletions src/personal-setup/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "personal-setup",
"version": "4.2.0",
"version": "5.0.0",
"name": "Personal Setup",
"description": "Sets up my desired software and configuration for any devcontainer environment.",
"mounts": [
Expand All @@ -16,7 +16,7 @@
}
],
"containerEnv": {
"RCRC": "/mnt/dotfiles/tag-devcontainer/rcrc",

"PROMPT_PREFIX": "", // Nerd font "remote" icon
"_IS_DEVCONTAINER": "true"
},
Expand Down
7 changes: 7 additions & 0 deletions src/personal-setup/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,10 @@ case "$ID" in
exit 1
;;
esac

echo "Setting up rcm configuration for user: $_REMOTE_USER"
cat > "$_REMOTE_USER_HOME/.rcrc" <<'EOF'
EXCLUDES="README.md"
DOTFILES_DIRS="/mnt/dotfiles /mnt/dotfiles-private"
TAGS="devcontainer"
EOF
4 changes: 3 additions & 1 deletion test/personal-setup/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ 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"
# WARNING: implicit dependency on the contents of the dotfiles repo
check "rcrc is created" bash -c "test -f $HOME/.rcrc"
check "dotfiles are linked" bash -c "test -L $HOME/.config/git/config_devcontainer"

# Check environment variables are set
check "_IS_DEVCONTAINER is set" bash -c "test \"\$_IS_DEVCONTAINER\" = \"true\""
Expand Down
Loading