diff --git a/.chezmoiscripts/run_init.sh.tmpl b/.chezmoiscripts/run_init.sh.tmpl index 882467c..7be5c8d 100755 --- a/.chezmoiscripts/run_init.sh.tmpl +++ b/.chezmoiscripts/run_init.sh.tmpl @@ -49,10 +49,5 @@ if ! [ -d ~/.cache/chezmoi/init_backup ]; then safe_backup ~/.zshrc ~/.zsh_history ~/.zprofile ~/.bashrc ~/.bash_history ~/.profile fi -# Brute force remove chezmoistate lock and initialize chezmoi -# apply with CZ_EXTR=1 will run twice as some logic in chemzoiexternal -# requires tools that are downloaded with chezmoiexternal -exec sh -c 'rm ~/.config/chezmoi/chezmoistate.boltdb \ - && chezmoi init && chezmoi apply \ - && printf "apply with externals #1/2...\n" && CZ_EXTR=1 chezmoi apply \ - && printf "apply with externals #2/2...\n" && CZ_EXTR=1 chezmoi apply' +# Brute force remove chezmoistate lock and restart init --apply +exec sh -c 'rm ~/.config/chezmoi/chezmoistate.boltdb && CZ_EXTR=1 chezmoi init --apply' diff --git a/chezmoi.roots/_src.posix/.chezmoiexternal.yaml.tmpl b/chezmoi.roots/_src.posix/.chezmoiexternal.yaml.tmpl index e9f3c35..1a878a7 100644 --- a/chezmoi.roots/_src.posix/.chezmoiexternal.yaml.tmpl +++ b/chezmoi.roots/_src.posix/.chezmoiexternal.yaml.tmpl @@ -112,7 +112,7 @@ "refreshPeriod" $defaultRefresh ) -}}{{- end -}}{{- end -}}{{- end -}} -{{- if and (lookPath "jq") (lookPath "cargo-binstall") -}} +{{- if lookPath "jq" -}} {{- $path_prefix = or (get (dict "linux" "./") .chezmoi.os) "" -}} {{- with $app_name := "eza" -}} {{- with $bin_url := (output "sh" "-c" ( diff --git a/chezmoi.roots/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl b/chezmoi.roots/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl index b02a2bb..92cc9ab 100755 --- a/chezmoi.roots/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl +++ b/chezmoi.roots/_src.posix/.chezmoiscripts/run_once_init.sh.tmpl @@ -1,3 +1,3 @@ #! /usr/bin/env bash -printf '_src.posix init\n' +printf '_home init\s'