diff --git a/modules/00-vanilla-apx-stacks.yml b/modules/00-vanilla-apx-stacks.yml deleted file mode 100644 index e55c5e5..0000000 --- a/modules/00-vanilla-apx-stacks.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: apx-stacks -type: shell -sources: - - type: git - url: https://github.com/Vanilla-OS/vanilla-apx-configs.git - tag: v1.0.0 -commands: -- mkdir -p /usr/share/apx -- mv /sources/apx-stacks/vanilla-apx-configs/stacks /usr/share/apx/ -- mv /sources/apx-stacks/vanilla-apx-configs/package-managers /usr/share/apx/ diff --git a/modules/00-vanilla-apx.yml b/modules/00-vanilla-apx.yml deleted file mode 100644 index 81d0fa4..0000000 --- a/modules/00-vanilla-apx.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: apx -type: shell -sources: - - type: tar - url: https://github.com/Vanilla-OS/apx/releases/download/v2.5.0/apx-amd64.tar.gz - checksum: fb00c7ca1796a45e3e41d3fa74be76cc36a86da5c4b7c8383519214e0d6b33d1 - only-arches: [amd64] - - type: tar - url: https://github.com/Vanilla-OS/apx/releases/download/v2.5.0/apx-arm64.tar.gz - checksum: 786039f71b13b2e4c2131a1db6fa619b57958be1ab10a3e74405d7f3ae9c5436 - only-arches: [arm64] -commands: -- mkdir -p /usr/bin -- cp /sources/apx/apx*/apx /usr/bin/apx -- chmod +x /usr/bin/apx -modules: -- name: distrobox - type: shell - sources: - - type: tar - url: https://github.com/89luca89/distrobox/archive/refs/tags/1.8.2.2.tar.gz - checksum: 0c797689c0b8c7c7c9fa53d1f5550657af95e64d8b8bbdc0fe374f341ebf6cd0 - commands: - - mkdir -p /usr/share/apx - - cp -r /sources/distrobox/1.8.2.2/distrobox-1.8.2.2 /usr/share/apx/distrobox - - chmod +x /usr/share/apx/distrobox/distrobox* - - sed -E -i 's/.*printf "distrobox.*/echo apx \$(echo ${container_name} | sed "s|apx-||") enter/g' /usr/share/apx/distrobox/distrobox-create -- name: apx-manpage - type: shell - sources: - - type: tar - url: https://github.com/Vanilla-OS/apx/releases/download/v2.5.0/apx-man.tar.gz - checksum: d92244c2b1bd8698e7a68311c6838cbcbfaa035bf73259b37f63f53405f26034 - commands: - - mv /sources/apx-manpage/apx-man/man/man1/apx.1 /usr/share/man/man1/ diff --git a/modules/998-distrobox-symlink.yml b/modules/998-distrobox-symlink.yml new file mode 100644 index 0000000..65f9cbe --- /dev/null +++ b/modules/998-distrobox-symlink.yml @@ -0,0 +1,6 @@ +# this module exists to allow legacy apx containers to locate distrobox executables +name: distrobox-symlink +type: shell +commands: + - mkdir -p /usr/share/apx/distrobox + - ln -s /usr/bin/distrobox-init /usr/bin/distrobox-export /usr/bin/distrobox-host-exec /usr/share/apx/distrobox/ diff --git a/recipe.yml b/recipe.yml index 2dcdc43..d4aea89 100644 --- a/recipe.yml +++ b/recipe.yml @@ -28,8 +28,6 @@ stages: includes: - modules/00-vanilla-abroot.yml - modules/00-vanilla-base-files.yml - - modules/00-vanilla-apx.yml - - modules/00-vanilla-apx-stacks.yml - modules/01-kernel.yml - modules/02-kernel-version-file.yml - modules/03-fswarn.yml @@ -51,6 +49,7 @@ stages: - modules/120-fingerprint.yml - modules/140-manpages.yml - modules/150-init-executable.yml + - modules/998-distrobox-symlink.yml - modules/998-podman-registry.yml - modules/999-replace-locale-gen.yml - modules/999-remove-grub-files.yml