diff --git a/.local/bin/provision b/.local/bin/provision index 27d4b79a..42dedf88 100644 --- a/.local/bin/provision +++ b/.local/bin/provision @@ -190,7 +190,7 @@ done find /usr/local/src/hiawatha -maxdepth 1 -mindepth 1 -type f | while read FILE; do BASENAME="$(basename "$FILE")" # Prevent repository-specific files from being copied over to user's HOME - if [[ "$BASENAME" != *'.md' ]] && [[ "$BASENAME" != *'.sh' ]] && [ "$BASENAME" != 'logo.png' ] && [ "$BASENAME" != '.gitlab-ci.yml' ]; then + if [[ "$BASENAME" != *'.md' ]] && [[ "$BASENAME" != *'.sh' ]] && [ "$BASENAME" != '.chezmoiroot' ] && [ "$BASENAME" != 'logo.png' ] && [ "$BASENAME" != '.gitlab-ci.yml' ]; then cp "$FILE" "$HOME/$BASENAME" chmod 600 "$HOME/$BASENAME" fi diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl index 454c6e05..abfdc322 100644 --- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl +++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_90-install-packages.tmpl @@ -5,14 +5,14 @@ # software: {{ index .softwareGroups .host.softwareGroup | join " " }} -if command -v install-software > /dev/null; then +if command -v install-program > /dev/null; then if command -v zx > /dev/null; then logg 'Installing packages defined in .chezmoidata.yaml under the .softwareGroups key' logg 'Installing: {{ index .softwareGroups .host.softwareGroup | join " " }}' - install-software {{ index .softwareGroups .host.softwareGroup | join " " }} + install-program {{ index .softwareGroups .host.softwareGroup | join " " }} else logg error '`zx` is not available' fi else - logg error '`install-software` is not in the PATH. It should be located in ~/.local/bin.' + logg error '`install-program` is not in the PATH. It should be located in ~/.local/bin.' fi diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_provision b/.local/share/chezmoi/home/dot_local/bin/executable_provision index 27d4b79a..42dedf88 100644 --- a/.local/share/chezmoi/home/dot_local/bin/executable_provision +++ b/.local/share/chezmoi/home/dot_local/bin/executable_provision @@ -190,7 +190,7 @@ done find /usr/local/src/hiawatha -maxdepth 1 -mindepth 1 -type f | while read FILE; do BASENAME="$(basename "$FILE")" # Prevent repository-specific files from being copied over to user's HOME - if [[ "$BASENAME" != *'.md' ]] && [[ "$BASENAME" != *'.sh' ]] && [ "$BASENAME" != 'logo.png' ] && [ "$BASENAME" != '.gitlab-ci.yml' ]; then + if [[ "$BASENAME" != *'.md' ]] && [[ "$BASENAME" != *'.sh' ]] && [ "$BASENAME" != '.chezmoiroot' ] && [ "$BASENAME" != 'logo.png' ] && [ "$BASENAME" != '.gitlab-ci.yml' ]; then cp "$FILE" "$HOME/$BASENAME" chmod 600 "$HOME/$BASENAME" fi