From 7a3d90d4fb2c61b3e2cfd6b4660ed927fb87a848 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Wed, 3 Jun 2026 12:45:35 -0400
Subject: [PATCH] Fix omarchy-zsh shared shell config packaging

---
 pkgbuilds/omarchy-zsh/PKGBUILD | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgbuilds/omarchy-zsh/PKGBUILD b/pkgbuilds/omarchy-zsh/PKGBUILD
index b6004a5..7aa62d0 100644
--- a/pkgbuilds/omarchy-zsh/PKGBUILD
+++ b/pkgbuilds/omarchy-zsh/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=omarchy-zsh
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Omarchy shell configuration for Zsh"
 arch=('any')
 url="https://github.com/omacom-io/omarchy-zsh"
@@ -20,10 +20,14 @@ package() {
 
   # Install shared shell config from omadots (aliases, functions, envs, inits, inputrc)
   install -dm755 "${pkgdir}/usr/share/${pkgname}/shell"
-  cp "${srcdir}/omadots-master/config/shell/"* "${pkgdir}/usr/share/${pkgname}/shell/"
+  cp -r "${srcdir}/omadots-master/config/shell/." "${pkgdir}/usr/share/${pkgname}/shell/"
 
   # Rewrite paths to source from installed package location instead of user config
-  sed -i 's|\$HOME/\.config/shell|/usr/share/omarchy-zsh/shell|g' "${pkgdir}/usr/share/${pkgname}/shell/all"
+  find "${pkgdir}/usr/share/${pkgname}/shell" -type f -exec \
+    sed -i \
+      -e 's|"\$HOME"/\.config/shell|/usr/share/omarchy-zsh/shell|g' \
+      -e 's|\$HOME/\.config/shell|/usr/share/omarchy-zsh/shell|g' \
+      {} +
 
   # Install zsh-specific zoptions from omarchy-zsh
   cp shell/zoptions "${pkgdir}/usr/share/${pkgname}/shell/"