From f00689e490ad5df9c6c09a6947b7f2871c6c05c0 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Tue, 6 Dec 2022 05:22:15 +0000
Subject: [PATCH] Update
 .local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl,
 .local/share/chezmoi/software.yml

---
 .../run_onchange_after_10-install-packages.tmpl    |  7 ++++---
 .local/share/chezmoi/software.yml                  | 14 +++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl
index 43fe8cbc..d9742555 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl
@@ -2,18 +2,19 @@
 
 {{- includeTemplate "universal/profile" }}
 {{- includeTemplate "universal/logg" }}
+{{- $softwareGroup := nospace (cat "_" .host.softwareGroup) }}
 
-# software: {{ index .softwareGroups (join "_" .host.softwareGroup) | toString | replace "[" "" | replace "]" "" }}
+# software: {{ index .softwareGroups $softwareGroup | toString | replace "[" "" | replace "]" "" }}
 # software map: {{ include (joinPath .chezmoi.homeDir ".local" "share" "chezmoi" "software.yml") | sha256sum }}
 
 if command -v install-program > /dev/null; then
   if command -v zx > /dev/null; then
     logg info 'Installing packages defined in .chezmoidata.yaml under the .softwareGroups key'
-    logg info 'Installing: {{ index .softwareGroups (join "_" .host.softwareGroup) | toString | replace "[" "" | replace "]" "" }}'
+    logg info 'Installing: {{ index .softwareGroups $softwareGroup | toString | replace "[" "" | replace "]" "" }}'
     # Ask for the administrator password upfront
     logg info 'A sudo password may be required for some of the installations'
     sudo echo "Sudo access granted."
-    install-program {{ index .softwareGroups (join "_" .host.softwareGroup) | toString | replace "[" "" | replace "]" "" }}
+    install-program {{ index .softwareGroups $softwareGroup | toString | replace "[" "" | replace "]" "" }}
   else
     logg error '`zx` is not available'
   fi
diff --git a/.local/share/chezmoi/software.yml b/.local/share/chezmoi/software.yml
index c462b16d..5a8c24fe 100644
--- a/.local/share/chezmoi/software.yml
+++ b/.local/share/chezmoi/software.yml
@@ -6714,17 +6714,6 @@ softwarePackages:
     _service: null
     brew: ykman
     pipx: yubikey-manager
-  youtube-dl:
-    _bin: null
-    _desc: null
-    _docs: null
-    _github: null
-    _home: null
-    _name: null
-    _service: null
-    brew: youtube-dl
-    pipx: youtube-dl
-    port: youtube-dl
   youtube-dl:
     _bin: null
     _desc: '[youtube-dl](https://github.com/ytdl-org/youtube-dl) is an open-source download manager for video and audio from YouTube and over 1000 other video hosting websites. It is released under the Unlicense software license and is one of the most popular projects on GitHub.'
@@ -6734,6 +6723,9 @@ softwarePackages:
     _name: youtube-dl
     _service: null
     ansible: professormanhattan.youtubedl
+    brew: youtube-dl
+    pipx: youtube-dl
+    port: youtube-dl
   yq:
     _bin: null
     _desc: '[yq](https://github.com/mikefarah/yq) is a free, open-source command-line YAML processor. It aims to be like [jq](https://gitlab.com/megabyte-labs/ansible-roles/jq) except for YAML files. It can read and write values to YAML files.'