diff --git a/pkgbuilds/omarchy-dev/PKGBUILD b/pkgbuilds/omarchy-dev/PKGBUILD index ce16459..58630ed 100644 --- a/pkgbuilds/omarchy-dev/PKGBUILD +++ b/pkgbuilds/omarchy-dev/PKGBUILD @@ -110,15 +110,14 @@ package() { # Runtime binaries — ship everything in bin/ except the debug helpers # that ship from omarchy-settings (needed before omarchy is installed, - # e.g. on the ISO live env), and the platform detector, which the settings - # package's pacman platform guard runs before omarchy is installed. + # e.g. on the ISO live env). install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/omarchy/bin" for bin in bin/*; do [[ -f $bin ]] || continue local base base=$(basename "$bin") case "$base" in - omarchy-debug|omarchy-debug-idle|omarchy-upload-log|omarchy-hw-platform) + omarchy-debug|omarchy-debug-idle|omarchy-upload-log) continue ;; esac diff --git a/pkgbuilds/omarchy-settings-dev/PKGBUILD b/pkgbuilds/omarchy-settings-dev/PKGBUILD index d5bd59f..6eb62e1 100644 --- a/pkgbuilds/omarchy-settings-dev/PKGBUILD +++ b/pkgbuilds/omarchy-settings-dev/PKGBUILD @@ -367,20 +367,16 @@ EOF # Pacman platform guard: refuses packages tagged for another hardware # platform. It ships here, not in omarchy, so it is resident before the # runtime and any hardware package install; the hook, the script it runs and - # the platform detector that script asks all travel together. omarchy leaves - # the detector out of its bin/ loop; the share/bin link keeps the Apple - # predicate's "detector beside me" lookup and the CLI router working. - # Conditional until the pinned source carries them. - if [[ -f bin/omarchy-hw-platform ]]; then - install -Dm755 bin/omarchy-hw-platform "$pkgdir/usr/bin/omarchy-hw-platform" - install -d "$pkgdir/usr/share/omarchy/bin" - ln -s /usr/bin/omarchy-hw-platform "$pkgdir/usr/share/omarchy/bin/omarchy-hw-platform" - fi + # the script's own copy of the platform detector travel together (omarchy + # keeps /usr/bin/omarchy-hw-platform). Conditional until the pinned source + # carries them. if [[ -f default/libalpm/hooks/00-omarchy-platform-guard.hook ]]; then install -Dm644 default/libalpm/hooks/00-omarchy-platform-guard.hook \ "$pkgdir/usr/share/libalpm/hooks/00-omarchy-platform-guard.hook" install -Dm755 default/libalpm/scripts/omarchy-platform-guard \ "$pkgdir/usr/share/libalpm/scripts/omarchy-platform-guard" + install -Dm755 bin/omarchy-hw-platform \ + "$pkgdir/usr/share/libalpm/scripts/omarchy-hw-platform" fi # Branding assets (logos, icons). diff --git a/pkgbuilds/omarchy-settings/PKGBUILD b/pkgbuilds/omarchy-settings/PKGBUILD index d44015a..3299e6c 100644 --- a/pkgbuilds/omarchy-settings/PKGBUILD +++ b/pkgbuilds/omarchy-settings/PKGBUILD @@ -365,20 +365,16 @@ EOF # Pacman platform guard: refuses packages tagged for another hardware # platform. It ships here, not in omarchy, so it is resident before the # runtime and any hardware package install; the hook, the script it runs and - # the platform detector that script asks all travel together. omarchy leaves - # the detector out of its bin/ loop; the share/bin link keeps the Apple - # predicate's "detector beside me" lookup and the CLI router working. - # Conditional until the pinned source carries them. - if [[ -f bin/omarchy-hw-platform ]]; then - install -Dm755 bin/omarchy-hw-platform "$pkgdir/usr/bin/omarchy-hw-platform" - install -d "$pkgdir/usr/share/omarchy/bin" - ln -s /usr/bin/omarchy-hw-platform "$pkgdir/usr/share/omarchy/bin/omarchy-hw-platform" - fi + # the script's own copy of the platform detector travel together (omarchy + # keeps /usr/bin/omarchy-hw-platform). Conditional until the pinned source + # carries them. if [[ -f default/libalpm/hooks/00-omarchy-platform-guard.hook ]]; then install -Dm644 default/libalpm/hooks/00-omarchy-platform-guard.hook \ "$pkgdir/usr/share/libalpm/hooks/00-omarchy-platform-guard.hook" install -Dm755 default/libalpm/scripts/omarchy-platform-guard \ "$pkgdir/usr/share/libalpm/scripts/omarchy-platform-guard" + install -Dm755 bin/omarchy-hw-platform \ + "$pkgdir/usr/share/libalpm/scripts/omarchy-hw-platform" fi # Branding assets (logos, icons). diff --git a/pkgbuilds/omarchy/PKGBUILD b/pkgbuilds/omarchy/PKGBUILD index 1ac7d53..41314ea 100644 --- a/pkgbuilds/omarchy/PKGBUILD +++ b/pkgbuilds/omarchy/PKGBUILD @@ -110,15 +110,14 @@ package() { # Runtime binaries — ship everything in bin/ except the debug helpers # that ship from omarchy-settings (needed before omarchy is installed, - # e.g. on the ISO live env), and the platform detector, which the settings - # package's pacman platform guard runs before omarchy is installed. + # e.g. on the ISO live env). install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/omarchy/bin" for bin in bin/*; do [[ -f $bin ]] || continue local base base=$(basename "$bin") case "$base" in - omarchy-debug|omarchy-debug-idle|omarchy-upload-log|omarchy-hw-platform) + omarchy-debug|omarchy-debug-idle|omarchy-upload-log) continue ;; esac