feat(chezmoi): add option for branch

ckagerer · Aug 18, 2024 · a6add09 · a6add09
1 parent 44ae202
commit a6add09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/chezmoi/devcontainer-feature.json b/src/chezmoi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "chezmoi",
     "id": "chezmoi",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "description": "Install chezmoi",
     "documentationURL": "https://github.com/ckagerer/devcontainer-features/tree/main/src/chezmoi",
     "options": {
@@ -10,6 +10,11 @@
             "default": "twpayne/dotfiles",
             "description": "The dotfiles repository to clone."
         },
+        "chezmoi_branch": {
+            "type": "string",
+            "default": "",
+            "description": "The branch to use for chezmoi. Empty for default branch."
+        },
         "atuin_user": {
             "type": "string",
             "default": "",

diff --git a/src/chezmoi/install.sh b/src/chezmoi/install.sh
@@ -43,6 +43,9 @@ CHEZMOI_USER_HOME="$(getent passwd "${CHEZMOI_USER}" | cut -d: -f6)"
 
 # run chezmoi
 CHEZMOI_ARGS=("init" "--apply")
+if [ -n "${CHEZMOI_BRANCH}" ]; then
+    CHEZMOI_ARGS+=("--branch" "${CHEZMOI_BRANCH}")
+fi
 CMD="chezmoi ${CHEZMOI_ARGS[*]} ${DOTFILES_REPO}"
 sudo --user "${CHEZMOI_USER}" bash -c "cd ${CHEZMOI_USER_HOME} && REMOTE_CONTAINERS=1 ${CMD}"