fix(chezmoi): continue if atuin import finds no histfile(s)

ckagerer · Mar 1, 2024 · 8b9fc5f · 8b9fc5f
1 parent dc7a1a5
commit 8b9fc5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/chezmoi/devcontainer-feature.json b/src/chezmoi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "chezmoi",
     "id": "chezmoi",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "Install chezmoi",
     "documentationURL": "https://github.com/ckagerer/devcontainer-features/tree/main/src/chezmoi",
     "options": {

diff --git a/src/chezmoi/install.sh b/src/chezmoi/install.sh
@@ -54,10 +54,10 @@ if [ -n "${ATUIN_USER}" ] && [ -n "${ATUIN_PASSWORD}" ] && [ -n "${ATUIN_KEY}" ]
     # Import history if configured
     if [ -n "${ATUIN_IMPORT_HISTORY}" ]; then
         if command -v bash &>/dev/null; then
-            sudo --user "${CHEZMOI_USER}" atuin import bash
+            sudo --user "${CHEZMOI_USER}" atuin import bash || true
         fi
         if command -v zsh &>/dev/null; then
-            sudo --user "${CHEZMOI_USER}" atuin import zsh
+            sudo --user "${CHEZMOI_USER}" atuin import zsh || true
         fi
     fi
 fi