diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index fec7261..887eb3b 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -50,9 +50,10 @@ package() { install -Dm0755 "scripts/pkgmgr-wrapper.sh" \ "$pkgdir/usr/bin/pkgmgr" - # Install Nix init helper - install -Dm0755 "scripts/nix/init.sh" \ - "$pkgdir/usr/lib/package-manager/nix/init.sh" + # Install Nix bootstrap (init + lib) + install -d "$pkgdir/usr/lib/package-manager/nix" + cp -a scripts/nix/* "$pkgdir/usr/lib/package-manager/nix/" + chmod 0755 "$pkgdir/usr/lib/package-manager/nix/init.sh" # Install the full repository into /usr/lib/package-manager mkdir -p "$pkgdir/usr/lib/package-manager" diff --git a/packaging/debian/rules b/packaging/debian/rules index af6a5d6..18b36c2 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -20,7 +20,7 @@ override_dh_auto_test: : # --------------------------------------------------------------------------- -# Install phase: copy wrapper + init script + full project source +# Install phase: copy wrapper + Nix bootstrap (init + lib) + full project source # --------------------------------------------------------------------------- override_dh_auto_install: # Create target directories @@ -31,10 +31,11 @@ override_dh_auto_install: install -m0755 scripts/pkgmgr-wrapper.sh \ debian/package-manager/usr/bin/pkgmgr - # Install shared Nix init script + # Install Nix bootstrap (init + lib) install -d debian/package-manager/usr/lib/package-manager/nix - install -m0755 scripts/nix/init.sh \ - debian/package-manager/usr/lib/package-manager/nix/init.sh + cp -a scripts/nix/* \ + debian/package-manager/usr/lib/package-manager/nix/ + chmod 0755 debian/package-manager/usr/lib/package-manager/nix/init.sh # Copy full project source into /usr/lib/package-manager, # but do not include the debian/ directory itself. diff --git a/packaging/fedora/package-manager.spec b/packaging/fedora/package-manager.spec index 083a5a4..a07f3cd 100644 --- a/packaging/fedora/package-manager.spec +++ b/packaging/fedora/package-manager.spec @@ -34,8 +34,8 @@ available on the system. %install rm -rf %{buildroot} + install -d %{buildroot}%{_bindir} -# Install project tree into a fixed, architecture-independent location. install -d %{buildroot}/usr/lib/package-manager # Copy full project source into /usr/lib/package-manager @@ -44,9 +44,10 @@ cp -a . %{buildroot}/usr/lib/package-manager/ # Wrapper install -m0755 scripts/pkgmgr-wrapper.sh %{buildroot}%{_bindir}/pkgmgr -# Shared Nix init script (ensure it is executable in the installed tree) +# Nix bootstrap (init + lib) install -d %{buildroot}/usr/lib/package-manager/nix -install -m0755 scripts/nix/init.sh %{buildroot}/usr/lib/package-manager/nix/init.sh +cp -a scripts/nix/* %{buildroot}/usr/lib/package-manager/nix/ +chmod 0755 %{buildroot}/usr/lib/package-manager/nix/init.sh # Remove packaging-only and development artefacts from the installed tree rm -rf \