mrrl

commit b60688ca644449e21912ff3751f17eb37cec6119
parent 77bfc5cabca84a8b163a1890e3c3ea8456841d5a
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat, 29 Nov 2025 14:34:21 +0000

Update genlinks /usr/(info|man|doc), more rules

Diffstat:
M
templates/dune
 | 
4
----
M
templates/genlinks
 | 
17
+++++++++++++----
M
templates/pkg/dune
 | 
3
---
M
templates/pkg/ocaml
 | 
4
----
M
templates/pkg/ocaml-findlib
 | 
3
---
M
templates/pkg/ocaml:dynlink
 | 
4
----
M
templates/pkg/ocaml_intrinsics_kernel
 | 
3
---
M
templates/pkg/ocamlbuild
 | 
3
---
M
templates/pkg/opam
 | 
3
---
M
templates/scriptsetup
 | 
3
---
M
templates/topkg
 | 
4
----
M
variants/ccx-x86_64/aat
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/abduco
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/alpine-keys
 | 
73
+++++++++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/apk-tools
 | 
87
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/applyuidgid-caps
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/argp-standalone
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/attr
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/bison
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/bootstrap.environment
 | 
8
++++----
M
variants/ccx-x86_64/busybox
 | 
6
+++---
M
variants/ccx-x86_64/busybox-ash
 | 
4
++--
M
variants/ccx-x86_64/busybox-attr
 | 
4
++--
M
variants/ccx-x86_64/busybox-awk
 | 
4
++--
M
variants/ccx-x86_64/busybox-bc
 | 
4
++--
M
variants/ccx-x86_64/busybox-bzip2
 | 
4
++--
M
variants/ccx-x86_64/busybox-chpst
 | 
4
++--
M
variants/ccx-x86_64/busybox-console
 | 
4
++--
M
variants/ccx-x86_64/busybox-coreutils
 | 
4
++--
M
variants/ccx-x86_64/busybox-coreutils-extra
 | 
4
++--
M
variants/ccx-x86_64/busybox-cpio
 | 
4
++--
M
variants/ccx-x86_64/busybox-cron
 | 
4
++--
M
variants/ccx-x86_64/busybox-daemontools
 | 
4
++--
M
variants/ccx-x86_64/busybox-diffutils
 | 
4
++--
M
variants/ccx-x86_64/busybox-dosfstools
 | 
4
++--
M
variants/ccx-x86_64/busybox-dpkg
 | 
4
++--
M
variants/ccx-x86_64/busybox-e2fsprogs
 | 
4
++--
M
variants/ccx-x86_64/busybox-ed
 | 
4
++--
M
variants/ccx-x86_64/busybox-findutils
 | 
4
++--
M
variants/ccx-x86_64/busybox-getty
 | 
4
++--
M
variants/ccx-x86_64/busybox-grep
 | 
4
++--
M
variants/ccx-x86_64/busybox-gzip
 | 
4
++--
M
variants/ccx-x86_64/busybox-i2c-tools
 | 
4
++--
M
variants/ccx-x86_64/busybox-iproute2
 | 
4
++--
M
variants/ccx-x86_64/busybox-iputils
 | 
4
++--
M
variants/ccx-x86_64/busybox-kbd
 | 
4
++--
M
variants/ccx-x86_64/busybox-linux-extra
 | 
4
++--
M
variants/ccx-x86_64/busybox-logging
 | 
4
++--
M
variants/ccx-x86_64/busybox-login
 | 
4
++--
M
variants/ccx-x86_64/busybox-lzop
 | 
4
++--
M
variants/ccx-x86_64/busybox-misc
 | 
4
++--
M
variants/ccx-x86_64/busybox-modutils
 | 
4
++--
M
variants/ccx-x86_64/busybox-mtd-utils
 | 
4
++--
M
variants/ccx-x86_64/busybox-net-misc
 | 
4
++--
M
variants/ccx-x86_64/busybox-net-tools
 | 
4
++--
M
variants/ccx-x86_64/busybox-process-extra
 | 
4
++--
M
variants/ccx-x86_64/busybox-procps
 | 
4
++--
M
variants/ccx-x86_64/busybox-psmisc
 | 
4
++--
M
variants/ccx-x86_64/busybox-rpm
 | 
4
++--
M
variants/ccx-x86_64/busybox-sed
 | 
4
++--
M
variants/ccx-x86_64/busybox-sh
 | 
4
++--
M
variants/ccx-x86_64/busybox-shadow
 | 
4
++--
M
variants/ccx-x86_64/busybox-su
 | 
4
++--
M
variants/ccx-x86_64/busybox-tar
 | 
4
++--
M
variants/ccx-x86_64/busybox-traceroute
 | 
4
++--
M
variants/ccx-x86_64/busybox-unzip
 | 
4
++--
M
variants/ccx-x86_64/busybox-util-linux-priv
 | 
4
++--
M
variants/ccx-x86_64/busybox-util-linux-unpriv
 | 
4
++--
M
variants/ccx-x86_64/busybox-vi
 | 
4
++--
M
variants/ccx-x86_64/busybox-wget
 | 
4
++--
M
variants/ccx-x86_64/busybox-xxd
 | 
4
++--
M
variants/ccx-x86_64/busybox-xz
 | 
4
++--
M
variants/ccx-x86_64/busybox:bootstrap
 | 
8
++++----
M
variants/ccx-x86_64/busybox:modutils
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/ca-certificates-wip-donotuse
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ccx-utils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/certdata2pem
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/confz
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/container-bin-image
 | 
112
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/containers
 | 
103
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/containers.environment
 | 
128
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/curl
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/default.environment
 | 
192
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/diffutils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/dune
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/easyseccomp
 | 
93
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/error-standalone
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/execline
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/execline:bootstrap
 | 
27
++++++++++++++++++---------
M
variants/ccx-x86_64/fileset
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/findutils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/flex
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/getconf
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/getent
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/git
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/gnu-make
 | 
23
++++++++++++++++-------
M
variants/ccx-x86_64/gnu-make:bootstrap
 | 
21
+++++++++++++++------
M
variants/ccx-x86_64/gperf
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/iconv
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/kbd
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/kernel.environment
 | 
6
+++---
M
variants/ccx-x86_64/libarchive
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libbsd
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libcap
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libcap:bootstrap
 | 
23
++++++++++++++++-------
M
variants/ccx-x86_64/libcgroup
 | 
87
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libelf
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libmd
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libressl
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libseccomp
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libunwind
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/linux
 | 
95
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/linux-qemu-guest
 | 
95
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/lnstools:bootstrap
 | 
29
+++++++++++++++++++----------
M
variants/ccx-x86_64/logincaps
 | 
85
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/m4
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/mandoc
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/mdev-scripts
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/mdevd
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/mdevd.environment
 | 
102
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/mlog
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/musl-cross-make
 | 
23
++++++++++++++++-------
M
variants/ccx-x86_64/musl-cross-make:bootstrap-0
 | 
17
+++++++++++++----
M
variants/ccx-x86_64/musl-cross-make:bootstrap-1
 | 
21
+++++++++++++++------
M
variants/ccx-x86_64/musl-fts
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/nawk
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/netbsd-curses
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml-astring
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-base
 | 
87
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-bos
 | 
101
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-cmdliner
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-compiler-libs
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-cppo
 | 
85
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-findlib
 | 
93
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-fmt
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-fpath
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-logs
 | 
95
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-lun
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-mtime
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-ppx_derivers
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-ppx_deriving
 | 
97
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-ppxlib
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-rresult
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-sexplib0
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-stdlib-shims
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-topkg
 | 
87
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml.environment
 | 
18
+++++++++---------
M
variants/ccx-x86_64/ocaml:dynlink
 | 
82
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml_intrinsics_kernel
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocamlbuild
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/opam
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/patch
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/pkgconf
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/ccx-x86_64/popt
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/pthbs-banginstall
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
8
++++----
M
variants/ccx-x86_64/rsync
 | 
87
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/s6
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/s6-dns
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/s6-linux-init
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/s6-linux-utils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/s6-networking
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/s6-portable-utils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/s6-rc
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/sandbox_rootfs
 | 
8
++++----
M
variants/ccx-x86_64/sandbox_rootns.environment
 | 
8
++++----
M
variants/ccx-x86_64/skalibs
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/skalibs:bootstrap
 | 
23
++++++++++++++++-------
M
variants/ccx-x86_64/snaprep
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/squashfs-tools
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/strace
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/system-config
 | 
147
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/system-config-init
 | 
125
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/system-config-rc
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/system-config-scripts
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/system-config-zsh
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/tinyssh
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/user-env
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/userspace.environment
 | 
180
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/vm.environment
 | 
4
++--
M
variants/ccx-x86_64/xbps
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/zsh
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/zstd
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/aat
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/abduco
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/alpine-keys
 | 
73
+++++++++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/apk-tools
 | 
87
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/applyuidgid-caps
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/argp-standalone
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/attr
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/bison
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/bootstrap.environment
 | 
8
++++----
M
variants/root-x86_64/busybox
 | 
6
+++---
M
variants/root-x86_64/busybox-ash
 | 
4
++--
M
variants/root-x86_64/busybox-attr
 | 
4
++--
M
variants/root-x86_64/busybox-awk
 | 
4
++--
M
variants/root-x86_64/busybox-bc
 | 
4
++--
M
variants/root-x86_64/busybox-bzip2
 | 
4
++--
M
variants/root-x86_64/busybox-chpst
 | 
4
++--
M
variants/root-x86_64/busybox-console
 | 
4
++--
M
variants/root-x86_64/busybox-coreutils
 | 
4
++--
M
variants/root-x86_64/busybox-coreutils-extra
 | 
4
++--
M
variants/root-x86_64/busybox-cpio
 | 
4
++--
M
variants/root-x86_64/busybox-cron
 | 
4
++--
M
variants/root-x86_64/busybox-daemontools
 | 
4
++--
M
variants/root-x86_64/busybox-diffutils
 | 
4
++--
M
variants/root-x86_64/busybox-dosfstools
 | 
4
++--
M
variants/root-x86_64/busybox-dpkg
 | 
4
++--
M
variants/root-x86_64/busybox-e2fsprogs
 | 
4
++--
M
variants/root-x86_64/busybox-ed
 | 
4
++--
M
variants/root-x86_64/busybox-findutils
 | 
4
++--
M
variants/root-x86_64/busybox-getty
 | 
4
++--
M
variants/root-x86_64/busybox-grep
 | 
4
++--
M
variants/root-x86_64/busybox-gzip
 | 
4
++--
M
variants/root-x86_64/busybox-i2c-tools
 | 
4
++--
M
variants/root-x86_64/busybox-iproute2
 | 
4
++--
M
variants/root-x86_64/busybox-iputils
 | 
4
++--
M
variants/root-x86_64/busybox-kbd
 | 
4
++--
M
variants/root-x86_64/busybox-linux-extra
 | 
4
++--
M
variants/root-x86_64/busybox-logging
 | 
4
++--
M
variants/root-x86_64/busybox-login
 | 
4
++--
M
variants/root-x86_64/busybox-lzop
 | 
4
++--
M
variants/root-x86_64/busybox-misc
 | 
4
++--
M
variants/root-x86_64/busybox-modutils
 | 
4
++--
M
variants/root-x86_64/busybox-mtd-utils
 | 
4
++--
M
variants/root-x86_64/busybox-net-misc
 | 
4
++--
M
variants/root-x86_64/busybox-net-tools
 | 
4
++--
M
variants/root-x86_64/busybox-process-extra
 | 
4
++--
M
variants/root-x86_64/busybox-procps
 | 
4
++--
M
variants/root-x86_64/busybox-psmisc
 | 
4
++--
M
variants/root-x86_64/busybox-rpm
 | 
4
++--
M
variants/root-x86_64/busybox-sed
 | 
4
++--
M
variants/root-x86_64/busybox-sh
 | 
4
++--
M
variants/root-x86_64/busybox-shadow
 | 
4
++--
M
variants/root-x86_64/busybox-su
 | 
4
++--
M
variants/root-x86_64/busybox-tar
 | 
4
++--
M
variants/root-x86_64/busybox-traceroute
 | 
4
++--
M
variants/root-x86_64/busybox-unzip
 | 
4
++--
M
variants/root-x86_64/busybox-util-linux-priv
 | 
4
++--
M
variants/root-x86_64/busybox-util-linux-unpriv
 | 
4
++--
M
variants/root-x86_64/busybox-vi
 | 
4
++--
M
variants/root-x86_64/busybox-wget
 | 
4
++--
M
variants/root-x86_64/busybox-xxd
 | 
4
++--
M
variants/root-x86_64/busybox-xz
 | 
4
++--
M
variants/root-x86_64/busybox:bootstrap
 | 
8
++++----
M
variants/root-x86_64/ca-certificates-wip-donotuse
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ccx-utils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/certdata2pem
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/confz
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/container-bin-image
 | 
112
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/containers
 | 
103
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/containers.environment
 | 
128
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/curl
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/default.environment
 | 
192
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/diffutils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/dune
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/easyseccomp
 | 
93
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/error-standalone
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/execline
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/execline:bootstrap
 | 
27
++++++++++++++++++---------
M
variants/root-x86_64/fileset
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/findutils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/flex
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/getconf
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/getent
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/git
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/gnu-make
 | 
23
++++++++++++++++-------
M
variants/root-x86_64/gnu-make:bootstrap
 | 
21
+++++++++++++++------
M
variants/root-x86_64/gperf
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/iconv
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/kbd
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libarchive
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libbsd
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libcap
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libcap:bootstrap
 | 
23
++++++++++++++++-------
M
variants/root-x86_64/libcgroup
 | 
87
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libelf
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libmd
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libressl
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libseccomp
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libunwind
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/linux-qemu-guest
 | 
95
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/lnstools:bootstrap
 | 
29
+++++++++++++++++++----------
M
variants/root-x86_64/logincaps
 | 
85
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/m4
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/mandoc
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/mdev-scripts
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/mdevd
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/mdevd.environment
 | 
102
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/mlog
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/musl-cross-make
 | 
23
++++++++++++++++-------
M
variants/root-x86_64/musl-cross-make:bootstrap-0
 | 
17
+++++++++++++----
M
variants/root-x86_64/musl-cross-make:bootstrap-1
 | 
21
+++++++++++++++------
M
variants/root-x86_64/musl-fts
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/nawk
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/netbsd-curses
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml-astring
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-base
 | 
87
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-bos
 | 
101
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-cmdliner
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-compiler-libs
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-cppo
 | 
85
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-findlib
 | 
93
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-fmt
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-fpath
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-logs
 | 
95
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-lun
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-mtime
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-ppx_derivers
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-ppx_deriving
 | 
97
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-ppxlib
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-rresult
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-sexplib0
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-stdlib-shims
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-topkg
 | 
87
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml.environment
 | 
18
+++++++++---------
M
variants/root-x86_64/ocaml:dynlink
 | 
82
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml_intrinsics_kernel
 | 
83
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocamlbuild
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/opam
 | 
91
+++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/patch
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/pkgconf
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/root-x86_64/popt
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/pthbs-banginstall
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
8
++++----
M
variants/root-x86_64/rsync
 | 
87
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/s6
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/s6-dns
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/s6-linux-init
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/s6-linux-utils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/s6-networking
 | 
89
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/s6-portable-utils
 | 
81
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/s6-rc
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/sandbox_rootfs
 | 
8
++++----
M
variants/root-x86_64/sandbox_rootns.environment
 | 
8
++++----
M
variants/root-x86_64/skalibs
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/skalibs:bootstrap
 | 
23
++++++++++++++++-------
M
variants/root-x86_64/snaprep
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/squashfs-tools
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/strace
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/system-config
 | 
147
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/system-config-init
 | 
125
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/system-config-rc
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/system-config-scripts
 | 
79
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/system-config-zsh
 | 
75
++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/tinyssh
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/user-env
 | 
77
+++++++++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/userspace.environment
 | 
180
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/vm.environment
 | 
4
++--
M
variants/root-x86_64/xbps
 | 
83
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/zsh
 | 
85
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/zstd
 | 
79
++++++++++++++++++++++++++++++++++++++++++++-----------------------------------

354 files changed, 10310 insertions(+), 8562 deletions(-)
diff --git a/templates/dune b/templates/dune
@@ -32,7 +32,3 @@ dune install \
 dune runtest --build-dir=.testenv --no-buffer --verbose
 
 {% endblock check %}
-{% block genlinks_rules %}
-{{ super() -}}
-$2 == "library.ocaml" { link($0); next }
-{% endblock genlinks_rules -%}
diff --git a/templates/genlinks b/templates/genlinks
@@ -31,20 +31,29 @@ $1!="."{exit 1}
 
 {% block genlinks_rules -%}
 {% endblock genlinks_rules %}
-$2 == "{{configdir}}" { link($0); next }
-$2 == "{{keysdir}}" { link($0); next }
-$2 == "{{zshdir}}" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
 $2 == "{{bindir}}" { link($0); next }
+$2 == "{{sbindir}}" { link($0); next }
 $2 == "bin" { link(s1("{{bindir}}", $0)); next }
+$2 == "sbin" { link(s1("{{sbindir}}", $0)); next }
 
 $2 == "{{dynlibdir}}" { link($0); next }
 $2 == "{{libdir}}" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("{{libdir}}", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("{{dynlibdir}}", $0)); next }
+$2 == "{{ocamldir}}" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "{{infodir}}"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "{{mandir}}"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "{{docdir}}"); next }
 
+$2 == "{{configdir}}" { link($0); next }
+$2 == "{{keysdir}}" { link($0); next }
+$2 == "{{zshdir}}" { link($0); next }
+$2 == "{{vimdir}}" { link($0); next }
 $2 == "{{mandir}}" { link($0); next }
 $2 == "{{infodir}}" { link($0); next }
 $2 == "{{docdir}}" { link($0); next }
diff --git a/templates/pkg/dune b/templates/pkg/dune
@@ -51,6 +51,3 @@ check_dynamic command/dune
 {% block genlinks_begin %}
 	x["./{{bindir}}/dune"]=1
 {% endblock genlinks_begin %}
-{% block genlinks_rules %}
-$2 == "library.ocaml" { link($0); next }
-{% endblock genlinks_rules -%}
diff --git a/templates/pkg/ocaml b/templates/pkg/ocaml
@@ -11,7 +11,3 @@ check_static command/ocamlopt
 {% block genlinks_begin %}
 	x["./{{bindir}}/ocamlopt"]=1
 {% endblock genlinks_begin %}
-{% block genlinks_rules %}
-$2 == "library.ocaml" { link($0); next }
-$2 == ".env-template" { link($0); next }
-{% endblock genlinks_rules -%}
diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib
@@ -54,6 +54,3 @@ check_dynamic command/ocamlfind
 	# x["./{{ocamldir}}/threads/META"]=1
 	# x["./{{ocamldir}}/unix/META"]=1
 {% endblock %}
-{% block genlinks_rules %}
-$2 == "library.ocaml" { link($0); next }
-{% endblock -%}
diff --git a/templates/pkg/ocaml:dynlink b/templates/pkg/ocaml:dynlink
@@ -11,7 +11,3 @@ autotools_config --enable-native-compiler --disable-native-toplevel --enable-ins
 {% block genlinks_begin %}
 	x["./{{bindir}}/ocamlopt"]=1
 {% endblock %}
-{% block genlinks_rules %}
-$2 == "library.ocaml" { link($0); next }
-$2 == ".env-template" { link($0); next }
-{% endblock -%}
diff --git a/templates/pkg/ocaml_intrinsics_kernel b/templates/pkg/ocaml_intrinsics_kernel
@@ -32,6 +32,3 @@ dune runtest --build-dir=.testenv --verbose
 {% block genlinks_begin %}
 	x["./{{ocamldir}}/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.ml"]=1
 {% endblock %}
-{% block genlinks_rules %}
-$2 == "library.ocaml" { link($0); next }
-{% endblock -%}
diff --git a/templates/pkg/ocamlbuild b/templates/pkg/ocamlbuild
@@ -33,6 +33,3 @@ check_dynamic command/ocamlbuild
 	x["./{{bindir}}/ocamlbuild"]=1
 	x["./{{mandir}}/man1/ocamlbuild.1"]=1
 {% endblock genlinks_begin %}
-{% block genlinks_rules %}
-$2 == "library.ocaml" { link($0); next }
-{% endblock genlinks_rules -%}
diff --git a/templates/pkg/opam b/templates/pkg/opam
@@ -48,6 +48,3 @@ make tests || true
 	x["./bin/opam"]=1
 	x["./bin/opam-installer"]=1
 {% endblock genlinks_begin %}
-{% block genlinks_rules %}
-$2 == "library.ocaml" { link($0); next }
-{% endblock genlinks_rules -%}
diff --git a/templates/scriptsetup b/templates/scriptsetup
@@ -26,6 +26,3 @@ if test -d zsh-functions; then
 fi
 
 {% endblock %}
-{% block genlinks_rules %}
-$2 == "vimfiles" { link($0); next }
-{% endblock -%}
diff --git a/templates/topkg b/templates/topkg
@@ -21,10 +21,6 @@ ocaml -I "$OCAMLPATH" pkg/pkg.ml build {% block topkg_build_args %}{% endblock %
 		--docdir="$dest/{{docdir}}/{{shortname}}"
 
 {% endblock install %}
-{% block genlinks_rules %}
-{{ super() -}}
-$2 == "library.ocaml" { link($0); next }
-{% endblock genlinks_rules -%}
 {% block genlinks_begin %}
 {{ m.genlinks_ocaml_library(upstream_name, [upstream_name]) }}
 {% endblock genlinks_begin %}
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
@@ -87,22 +87,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
@@ -110,20 +110,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/alpine-keys b/variants/ccx-x86_64/alpine-keys
@@ -1,32 +1,32 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
@@ -68,20 +68,29 @@ $1!="."{exit 1}
 
 $2 == "keys" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
-#+zstd.18f8f8d6e42a094dc68f3dd9a0ce6bb09a5e3c9098c1928d859bb9883f7ce41b
-#+pkgconf-pkg-config.a4abc7e539011e377d637bd41423bf7f1d68e50735c69c42cc11144aa694d188
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
+#+zstd.a0e2c09721b9241e54cc7822207678a563fe1ecf957221a0ec316abe433b45a4
+#+pkgconf-pkg-config.cac9c462057ee1ddc2e06a84629e23bfefda47f2fc0b45b5ac9d951b62f5dd03
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -108,20 +108,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
-#+libcap.0d360516e5086192b93754e08efffd72f6504af56d8a514a460fa42589cbf1a0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
+#+libcap.5cf43453236e91c96b9e5bd13cac766b502bc44ee5353add5935447da6705a7e
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
@@ -97,20 +97,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
@@ -106,20 +106,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -125,20 +125,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+flex.d99904918d6a8605243d4e8c75e4c6866f8efa442c30e48fc8534a001abec6e9
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+flex.60e63266e21b63f26734c8d4776c87bbefc6b16938160c5c4b8302845d9d1134
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -127,20 +127,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/bootstrap.environment b/variants/ccx-x86_64/bootstrap.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd-
\ No newline at end of file
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
diff --git a/variants/ccx-x86_64/busybox-ash b/variants/ccx-x86_64/busybox-ash
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-attr b/variants/ccx-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-awk b/variants/ccx-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bc b/variants/ccx-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bzip2 b/variants/ccx-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-chpst b/variants/ccx-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-console b/variants/ccx-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils b/variants/ccx-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils-extra b/variants/ccx-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cpio b/variants/ccx-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cron b/variants/ccx-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-daemontools b/variants/ccx-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dosfstools b/variants/ccx-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dpkg b/variants/ccx-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-e2fsprogs b/variants/ccx-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-ed b/variants/ccx-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-getty b/variants/ccx-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-grep b/variants/ccx-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-gzip b/variants/ccx-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-i2c-tools b/variants/ccx-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iproute2 b/variants/ccx-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iputils b/variants/ccx-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-linux-extra b/variants/ccx-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-logging b/variants/ccx-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-lzop b/variants/ccx-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-misc b/variants/ccx-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-modutils b/variants/ccx-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-mtd-utils b/variants/ccx-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-misc b/variants/ccx-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-tools b/variants/ccx-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-process-extra b/variants/ccx-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-procps b/variants/ccx-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-psmisc b/variants/ccx-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-rpm b/variants/ccx-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sed b/variants/ccx-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sh b/variants/ccx-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-shadow b/variants/ccx-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-su b/variants/ccx-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-tar b/variants/ccx-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-traceroute b/variants/ccx-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-unzip b/variants/ccx-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-priv b/variants/ccx-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-unpriv b/variants/ccx-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-vi b/variants/ccx-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-wget b/variants/ccx-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xxd b/variants/ccx-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xz b/variants/ccx-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox:bootstrap b/variants/ccx-x86_64/busybox:bootstrap
@@ -1,14 +1,14 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-make=/home/ccx/versions/gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
+mcm=/home/ccx/versions/musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+make=/home/ccx/versions/gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CFLAGS="-D_GNU_SOURCE"
diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.da0a328fdc3f60c8dbafd5c96804471afaff3df3022a1b1a8c6836f83b252463
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
+#+linux-qemu-guest.e42986d0e927dec74d1dd581ed1de755c2b78a4af57cee45e58a88e796249d4a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
@@ -60,7 +60,7 @@ export CFLAGS="-D_GNU_SOURCE"
 export LDFLAGS="-static"
 # TODO: indirection via deps directory/symlink
 cat >>.config <<EOF
-CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.da0a328fdc3f60c8dbafd5c96804471afaff3df3022a1b1a8c6836f83b252463"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.e42986d0e927dec74d1dd581ed1de755c2b78a4af57cee45e58a88e796249d4a"
 EOF
 make oldconfig
 cat .config
diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+certdata2pem.6e4142862687182b0ae3443ab57db8116e9e555ed962ef4577453d5591a80e2a
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+certdata2pem.468748e93c0ff37efa192cea8589bcf527c1b831aa8ca55fe7f51b64faeecb10
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
@@ -78,20 +78,29 @@ $1!="."{exit 1}
 # TODO! need better matching, will break if you move ssldir out of configdir!
 $2 == "config" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
@@ -127,20 +127,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
@@ -95,20 +95,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
@@ -84,22 +84,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -1,60 +1,60 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-dosfstools.85265e825ae5e83cb7ef1f8e8c37509b8de118a1ab5d63035b14bccd8655266e
-#+busybox-e2fsprogs.2248b9ee6634404aea167b90741007bf4a8e52de081def33cb41bfa3f63958d1
-#+busybox-iproute2.a2c7f4d57fdfeea95298b0e2be848b9512f3df3442922de5db5053bc5c9bffd9
-#+busybox-iputils.784abb3101c331fbe4418d365b8ec6fc49a2bbd2cc5c29d1f0f66c15f1e4947a
-#+busybox-net-misc.ebc1d13bfb08e44175582391bc984df4c81608fa66d615d59e2b108916a64d19
-#+busybox-net-tools.337778bb47c51371173ce977d7b5e3a378b74fd09fc6a52da56cd092ecae8453
-#+busybox-traceroute.4dab80dd286d621ed36681ebccee1a3ac1d005197dc01c707f11b8bce0f85c31
-#+busybox-wget.2410b3d8c37c4265f4e042352876502e96c666417f06b8496f2a53709cc883c7
-#+busybox-chpst.93e91c224002624056af2e2d4bdf7a0f394f2fc6fa0d5ee38a4c21b944814921
-#+busybox-console.0c8afa6c2060ce6d5827715aa54cd1f083fb509484142fad80d2f962cf49cb55
-#+busybox-getty.8767092bb4cba017e07d358949575fa77f8c5ea7394102d67a6268e867f1962d
-#+busybox-i2c-tools.0eb043f1ba88f3d459f00698f86f8f8ffd80ae8c2fc0d7d22fe5d5bd07932261
-#+busybox-linux-extra.59751c34e54d157f91ae1b1c408b78cd900b1a04cec9cec31bcb8850e3816231
-#+busybox-mtd-utils.cde3695812ff988954694ba606d8a4455c6e96a81b775b732d1a3ed097d87f3a
-#+busybox-shadow.2bac52bc1122d66e84a9cd22a3a627eaa963013524f99bb85421918aed0cd026
-#+busybox-su.021a194c14730d11718269e924bdb40be96368f5a2a783cbf024691619af0aaf
-#+busybox-util-linux-priv.0963da9601439f24ce716a1a4a1dc771d9b2df8358be065326f531456fac848c
-#+busybox-logging.ce834cd221dfcc14ec2d50035dc958fcd82c38484eec994888258738454c372b
-#+busybox-cron.0942ef686004d2a839d1d7351b6f81101c924098955d0be3db6cd3af657c700c
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-login.2ba1ede040e900a1b3dbe74ff1d2b0749deb6c67833586926ecb11471d342b2d
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+ccx-utils.41274c253c01733750843bcd46eb5249e9397567936f222486ee5ba7518e87e1
-#+applyuidgid-caps.336a5f45a3827cb86627163f318e360c670c7f57503878429e2870c0e7b81ae4
-#+easyseccomp.382375f153988ffea93ec1c640a28a12b8e2699374264dcf50704069aec005f3
-#+mlog.235369627809906a4e7547f28f9f71a5501901d63e418e2ec16cbd56c98c444b
-#+abduco.da664649e26d3712544d59f88f8de80a609dae4bcb0d0627978aba46e0419b9a
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-dosfstools.53e30486c6e40b854611e47e94c0dfa06c41691311cbbbaa290331b3d28cfb05
+#+busybox-e2fsprogs.a9db189743f4ef5ee540c2adc08214fe94a6ff732c50e02ae4c623706c246f7c
+#+busybox-iproute2.d538589972980a1e3a52e4830949ced1c22e0050b1ff57762b2972063ad91648
+#+busybox-iputils.8cbd732f5342bf8da8c1456cffb23554dbafa6fb19f8c6a19f1b67aaa243a662
+#+busybox-net-misc.eb9c09a2d8c9518a4cd038571adf312cfdc3e57eeed4e74db8e78c347ec68853
+#+busybox-net-tools.c82b35e4e8c518b44444f68f0cf50f4a2c01b6eb95a8983e0d9d7814d198f32a
+#+busybox-traceroute.2429ce3a0c431dadfc0668d60fb13d4a7fca2d5d16ade42ffecf36ce4f89baa0
+#+busybox-wget.ce90f68067c9539751edd9e2cca3be07bf15075ee1c690d4062a1bf226d342b0
+#+busybox-chpst.af71fed1aff7bf86c69557b774db59b4fe36d7f778ef485410430918b19e6589
+#+busybox-console.397dca7c32183b4b0aadb656e390e9529f79f8d40b50a956d843e889279edc28
+#+busybox-getty.a336c850d60eb7c5c7ec1db78052c3580a5a4044a04c32b744ea5107a2c1ce58
+#+busybox-i2c-tools.0fd529f075289fdbaa0bc73d49a1bef6af00e83fbb7117c16b8db087531ac0f8
+#+busybox-linux-extra.24d1b6d1976c35b6fd60dcbad716cadd30c6c1809ea38356b44646bbcd41ac57
+#+busybox-mtd-utils.d71bc206f11ac28fc084056ad5b582b7644d62689fa8e1af63812a322411af3e
+#+busybox-shadow.5e755181d3b2dfda29acbef0db527c6978db81962eb1cb0a330946aab63e0280
+#+busybox-su.3cdd99ba3237190df1dc8044384db002690ef70583173ee6fbc12d4a63891289
+#+busybox-util-linux-priv.f16ab2e2d7ebbc437fc8281906d240a776777ccd29a8fc1156fdd5d53aa4ba53
+#+busybox-logging.7fe744403efd37f85e6c2caf9b104a61d2d38d69c19bf1e099347468266747aa
+#+busybox-cron.2fce66542d321d6d2c9c9a6f2059b973cfc3d5ef5c06f9157ded14f79537ce59
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-login.9c1da40015dd442b7ff32e23f6cbbd67dbf398a1dde32a9d3424692ca4a36961
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+ccx-utils.ef6e27392b3e3e9f98095dfcefff7cc22a4534be8e9bae6178b4f9d77017c0b0
+#+applyuidgid-caps.e20a9573b922544197abbe5154be42d910438916fb3a143403e5dd1eef6d10d7
+#+easyseccomp.8fca939c61638c71d54e96afb1b04e107ad96d223adead02002530e675fbd865
+#+mlog.82418175ab4f7096bdd077178a4d1ee493bdf66a43e03e226a4716d326b45b04
+#+abduco.3831c55b89171d2f8bb558276be2da827ccc2bd9ebade4c411e43f776ffe9cfb
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108
 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
 
 img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+alpine-keys.185748a775c212be63f4b867538a34a348e2762f38c2a8d2bf1b2449f1e3ea50
-#+apk-tools.11b59b0e8d4834809ad6545d19ac3476f2d4423c4973fce357923fc1d469ca40
-#+xbps.44453532397d0f2a57a0198b0dc68b7c239bf5a8ac16a80f12a94140396a7be9
-#+container-bin-image.959882779af901eb3b1e92305e7ea25a2736123c28e21c7c2e5c53f2e37bbe2c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+alpine-keys.e2129a1d04a8c88d1e4c44adf75119e6c4168e716859bc5ec4c490ee43c91d08
+#+apk-tools.90720114fc824735c187ae6dfc800818e536d969fc83977cf3daa8e621890be4
+#+xbps.b14047f6b8e7ff5e4232a4e933dbaaa756ae5e5566b24a0ef227a464658a259d
+#+container-bin-image.b052289184f02606f980ea7e3f4fb0e44c2cf0fa8cc78a9b345c18a1a4b5885d
 #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
 
 
@@ -76,10 +76,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
 	"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
 
 mkdir -p "${dest}/deps/command"
-ln -sf '/home/ccx/versions/apk-tools.11b59b0e8d4834809ad6545d19ac3476f2d4423c4973fce357923fc1d469ca40/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.44453532397d0f2a57a0198b0dc68b7c239bf5a8ac16a80f12a94140396a7be9/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.90720114fc824735c187ae6dfc800818e536d969fc83977cf3daa8e621890be4/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.b14047f6b8e7ff5e4232a4e933dbaaa756ae5e5566b24a0ef227a464658a259d/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.185748a775c212be63f4b867538a34a348e2762f38c2a8d2bf1b2449f1e3ea50'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.e2129a1d04a8c88d1e4c44adf75119e6c4168e716859bc5ec4c490ee43c91d08'/keys/alpine/*/*; do
 	test -f "$f"
 	d=$(basename "${f%/*}")
 	mkdir -p "${dest}/deps/keys/alpine/$d"
@@ -87,13 +87,13 @@ for f in '/home/ccx/versions/alpine-keys.185748a775c212be63f4b867538a34a348e2762
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.44453532397d0f2a57a0198b0dc68b7c239bf5a8ac16a80f12a94140396a7be9'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.b14047f6b8e7ff5e4232a4e933dbaaa756ae5e5566b24a0ef227a464658a259d'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.959882779af901eb3b1e92305e7ea25a2736123c28e21c7c2e5c53f2e37bbe2c/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.959882779af901eb3b1e92305e7ea25a2736123c28e21c7c2e5c53f2e37bbe2c/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.959882779af901eb3b1e92305e7ea25a2736123c28e21c7c2e5c53f2e37bbe2c/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.b052289184f02606f980ea7e3f4fb0e44c2cf0fa8cc78a9b345c18a1a4b5885d/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.b052289184f02606f980ea7e3f4fb0e44c2cf0fa8cc78a9b345c18a1a4b5885d/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.b052289184f02606f980ea7e3f4fb0e44c2cf0fa8cc78a9b345c18a1a4b5885d/container-bin-image' "${dest}/deps/"
  
 
 
@@ -126,22 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -1,64 +1,64 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-dosfstools.85265e825ae5e83cb7ef1f8e8c37509b8de118a1ab5d63035b14bccd8655266e
-#+busybox-e2fsprogs.2248b9ee6634404aea167b90741007bf4a8e52de081def33cb41bfa3f63958d1
-#+busybox-iproute2.a2c7f4d57fdfeea95298b0e2be848b9512f3df3442922de5db5053bc5c9bffd9
-#+busybox-iputils.784abb3101c331fbe4418d365b8ec6fc49a2bbd2cc5c29d1f0f66c15f1e4947a
-#+busybox-net-misc.ebc1d13bfb08e44175582391bc984df4c81608fa66d615d59e2b108916a64d19
-#+busybox-net-tools.337778bb47c51371173ce977d7b5e3a378b74fd09fc6a52da56cd092ecae8453
-#+busybox-traceroute.4dab80dd286d621ed36681ebccee1a3ac1d005197dc01c707f11b8bce0f85c31
-#+busybox-wget.2410b3d8c37c4265f4e042352876502e96c666417f06b8496f2a53709cc883c7
-#+busybox-chpst.93e91c224002624056af2e2d4bdf7a0f394f2fc6fa0d5ee38a4c21b944814921
-#+busybox-console.0c8afa6c2060ce6d5827715aa54cd1f083fb509484142fad80d2f962cf49cb55
-#+busybox-getty.8767092bb4cba017e07d358949575fa77f8c5ea7394102d67a6268e867f1962d
-#+busybox-i2c-tools.0eb043f1ba88f3d459f00698f86f8f8ffd80ae8c2fc0d7d22fe5d5bd07932261
-#+busybox-linux-extra.59751c34e54d157f91ae1b1c408b78cd900b1a04cec9cec31bcb8850e3816231
-#+busybox-mtd-utils.cde3695812ff988954694ba606d8a4455c6e96a81b775b732d1a3ed097d87f3a
-#+busybox-shadow.2bac52bc1122d66e84a9cd22a3a627eaa963013524f99bb85421918aed0cd026
-#+busybox-su.021a194c14730d11718269e924bdb40be96368f5a2a783cbf024691619af0aaf
-#+busybox-util-linux-priv.0963da9601439f24ce716a1a4a1dc771d9b2df8358be065326f531456fac848c
-#+busybox-logging.ce834cd221dfcc14ec2d50035dc958fcd82c38484eec994888258738454c372b
-#+busybox-cron.0942ef686004d2a839d1d7351b6f81101c924098955d0be3db6cd3af657c700c
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+s6-portable-utils.3b835184b86cc4c003716d4116f583142f789b215afc24c9c3070f6b55280b7d
-#+s6-linux-utils.fe7aec6f035444375d4354c8d94d828d27014e879a4309129a1a07201ead60b0
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+confz.3ce5fc67eb7c3db90a88c734f99b147fe7230e293d4411f3ab27d967d2f9d8dd
-#+containers.c2e10e8452b778cf9ed4513c3e62044b220c9c2eb8ad4299b126f0aa0e8c5367
-#+xbps.44453532397d0f2a57a0198b0dc68b7c239bf5a8ac16a80f12a94140396a7be9
-#+zstd.18f8f8d6e42a094dc68f3dd9a0ce6bb09a5e3c9098c1928d859bb9883f7ce41b
-#+apk-tools.11b59b0e8d4834809ad6545d19ac3476f2d4423c4973fce357923fc1d469ca40
-#+alpine-keys.185748a775c212be63f4b867538a34a348e2762f38c2a8d2bf1b2449f1e3ea50
-#+getent.5d02dd9936859c0934ac274ca67387f92ecdd1b8dd624780d1e66b8a0f1f6342
-#+fileset.5f7665e33232f7be0b4d12bdf6e4be6b9e23402e11a1c5c1dbec16173b343533
-#+ccx-utils.41274c253c01733750843bcd46eb5249e9397567936f222486ee5ba7518e87e1
-#+easyseccomp.382375f153988ffea93ec1c640a28a12b8e2699374264dcf50704069aec005f3
-#+findutils.9fd553f92b4bd2e599b436a04e922d94f84e76db439e0b4051e75e7017bee41c
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66-
\ No newline at end of file
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-dosfstools.53e30486c6e40b854611e47e94c0dfa06c41691311cbbbaa290331b3d28cfb05
+#+busybox-e2fsprogs.a9db189743f4ef5ee540c2adc08214fe94a6ff732c50e02ae4c623706c246f7c
+#+busybox-iproute2.d538589972980a1e3a52e4830949ced1c22e0050b1ff57762b2972063ad91648
+#+busybox-iputils.8cbd732f5342bf8da8c1456cffb23554dbafa6fb19f8c6a19f1b67aaa243a662
+#+busybox-net-misc.eb9c09a2d8c9518a4cd038571adf312cfdc3e57eeed4e74db8e78c347ec68853
+#+busybox-net-tools.c82b35e4e8c518b44444f68f0cf50f4a2c01b6eb95a8983e0d9d7814d198f32a
+#+busybox-traceroute.2429ce3a0c431dadfc0668d60fb13d4a7fca2d5d16ade42ffecf36ce4f89baa0
+#+busybox-wget.ce90f68067c9539751edd9e2cca3be07bf15075ee1c690d4062a1bf226d342b0
+#+busybox-chpst.af71fed1aff7bf86c69557b774db59b4fe36d7f778ef485410430918b19e6589
+#+busybox-console.397dca7c32183b4b0aadb656e390e9529f79f8d40b50a956d843e889279edc28
+#+busybox-getty.a336c850d60eb7c5c7ec1db78052c3580a5a4044a04c32b744ea5107a2c1ce58
+#+busybox-i2c-tools.0fd529f075289fdbaa0bc73d49a1bef6af00e83fbb7117c16b8db087531ac0f8
+#+busybox-linux-extra.24d1b6d1976c35b6fd60dcbad716cadd30c6c1809ea38356b44646bbcd41ac57
+#+busybox-mtd-utils.d71bc206f11ac28fc084056ad5b582b7644d62689fa8e1af63812a322411af3e
+#+busybox-shadow.5e755181d3b2dfda29acbef0db527c6978db81962eb1cb0a330946aab63e0280
+#+busybox-su.3cdd99ba3237190df1dc8044384db002690ef70583173ee6fbc12d4a63891289
+#+busybox-util-linux-priv.f16ab2e2d7ebbc437fc8281906d240a776777ccd29a8fc1156fdd5d53aa4ba53
+#+busybox-logging.7fe744403efd37f85e6c2caf9b104a61d2d38d69c19bf1e099347468266747aa
+#+busybox-cron.2fce66542d321d6d2c9c9a6f2059b973cfc3d5ef5c06f9157ded14f79537ce59
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+s6-portable-utils.328d4e19549e0d61e320a5d082ee41208da820089457814de7bd35c6b6f8d99f
+#+s6-linux-utils.8527b26bae8aac43389702dcb32cee27f8fc01c1fe56ba729d2db8c3e9fcfa43
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+confz.638980c06bc1ab1c3a46c2dac87c4861404eb3a8936249430b28c77c8dc20130
+#+containers.3a73540556541ea75056b397c7b64be22dd87ae4ac0572e8360f1c5637a8901e
+#+xbps.b14047f6b8e7ff5e4232a4e933dbaaa756ae5e5566b24a0ef227a464658a259d
+#+zstd.a0e2c09721b9241e54cc7822207678a563fe1ecf957221a0ec316abe433b45a4
+#+apk-tools.90720114fc824735c187ae6dfc800818e536d969fc83977cf3daa8e621890be4
+#+alpine-keys.e2129a1d04a8c88d1e4c44adf75119e6c4168e716859bc5ec4c490ee43c91d08
+#+getent.d79f920cfbee726e830016b467c8bb87433f9a8a0ebaece3a1dc36d631e24209
+#+fileset.2f03e2b9228c4de18829c4525c6752fe03888aaadba59a968004abad48a0810b
+#+ccx-utils.ef6e27392b3e3e9f98095dfcefff7cc22a4534be8e9bae6178b4f9d77017c0b0
+#+easyseccomp.8fca939c61638c71d54e96afb1b04e107ad96d223adead02002530e675fbd865
+#+findutils.bedc671aaff0ca89c64416ce7b6779960420cc8c690b2fdd9e3e028c67af2bd3
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -146,20 +146,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,96 +1,96 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-dosfstools.85265e825ae5e83cb7ef1f8e8c37509b8de118a1ab5d63035b14bccd8655266e
-#+busybox-e2fsprogs.2248b9ee6634404aea167b90741007bf4a8e52de081def33cb41bfa3f63958d1
-#+busybox-iproute2.a2c7f4d57fdfeea95298b0e2be848b9512f3df3442922de5db5053bc5c9bffd9
-#+busybox-iputils.784abb3101c331fbe4418d365b8ec6fc49a2bbd2cc5c29d1f0f66c15f1e4947a
-#+busybox-net-misc.ebc1d13bfb08e44175582391bc984df4c81608fa66d615d59e2b108916a64d19
-#+busybox-net-tools.337778bb47c51371173ce977d7b5e3a378b74fd09fc6a52da56cd092ecae8453
-#+busybox-traceroute.4dab80dd286d621ed36681ebccee1a3ac1d005197dc01c707f11b8bce0f85c31
-#+busybox-wget.2410b3d8c37c4265f4e042352876502e96c666417f06b8496f2a53709cc883c7
-#+busybox-chpst.93e91c224002624056af2e2d4bdf7a0f394f2fc6fa0d5ee38a4c21b944814921
-#+busybox-console.0c8afa6c2060ce6d5827715aa54cd1f083fb509484142fad80d2f962cf49cb55
-#+busybox-getty.8767092bb4cba017e07d358949575fa77f8c5ea7394102d67a6268e867f1962d
-#+busybox-i2c-tools.0eb043f1ba88f3d459f00698f86f8f8ffd80ae8c2fc0d7d22fe5d5bd07932261
-#+busybox-linux-extra.59751c34e54d157f91ae1b1c408b78cd900b1a04cec9cec31bcb8850e3816231
-#+busybox-mtd-utils.cde3695812ff988954694ba606d8a4455c6e96a81b775b732d1a3ed097d87f3a
-#+busybox-shadow.2bac52bc1122d66e84a9cd22a3a627eaa963013524f99bb85421918aed0cd026
-#+busybox-su.021a194c14730d11718269e924bdb40be96368f5a2a783cbf024691619af0aaf
-#+busybox-util-linux-priv.0963da9601439f24ce716a1a4a1dc771d9b2df8358be065326f531456fac848c
-#+busybox-logging.ce834cd221dfcc14ec2d50035dc958fcd82c38484eec994888258738454c372b
-#+busybox-cron.0942ef686004d2a839d1d7351b6f81101c924098955d0be3db6cd3af657c700c
-#+attr.285118da456b4e3be682bab584b9a8fa8240094bc691604a77ae209aac3a40c9
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+diffutils.54f2d772bd560d3366e9b2c6056b6b4c8963b144904b142565cec869f1406e32
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+flex.d99904918d6a8605243d4e8c75e4c6866f8efa442c30e48fc8534a001abec6e9
-#+bison.7269fec828b34f75951079495c1bee4536d31586ca10fccf4450720c6cf4cba6
-#+rsync.f72eca8c09ddccfaa9d9bad23b0c75527f5bbdc03cbb9b2ef142f74f1418d270
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+s6-rc.8a12474e2ad067516a8e6fd45a8850f134a67680b8e4348c5781cf6e29e4c249
-#+s6-portable-utils.3b835184b86cc4c003716d4116f583142f789b215afc24c9c3070f6b55280b7d
-#+s6-linux-utils.fe7aec6f035444375d4354c8d94d828d27014e879a4309129a1a07201ead60b0
-#+s6-linux-init.654fd4a6fafc787dcd8aba606ea96a88c204e44f47ce98e11f7db6cd945757b6
-#+mdevd.2ad5582d1a920ad8114f4110ed6244bd0033ff862ef92b3f477d24e33d1965be
-#+s6-dns.401ef3a77db8adaeb99591606c8f6e8540058147af984c975bb1d81d5cb79d16
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
-#+s6-networking.e3faf7506c0e71f584d96695af560f63ef7003f2cd44d2a25353b03773c8cd3e
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
-#+aat.b98e04d9aa274220ed7300725ed3549ecbbefd647bb173214f3c3aea431d505a
-#+confz.3ce5fc67eb7c3db90a88c734f99b147fe7230e293d4411f3ab27d967d2f9d8dd
-#+containers.c2e10e8452b778cf9ed4513c3e62044b220c9c2eb8ad4299b126f0aa0e8c5367
-#+fileset.5f7665e33232f7be0b4d12bdf6e4be6b9e23402e11a1c5c1dbec16173b343533
-#+logincaps.a711ec9f87cc294cb22d71006aeac7c2aedf6a1563d734ac088cfb6e17cdf4b1
-#+snaprep.c927d0149ba6a32cb8080dde702ef7e1da16c46fb16bc50553a95d893bb6672a
-#+curl.ce3347b501eb872cb16c7aa0353f4b9af848a13363915ea8f4176f4a2436fe31
-#+git.47dab6270a4644cfaa3e839c0d2d360be942b3f8745232aeaf62c8af41167636
-#+xbps.44453532397d0f2a57a0198b0dc68b7c239bf5a8ac16a80f12a94140396a7be9
-#+apk-tools.11b59b0e8d4834809ad6545d19ac3476f2d4423c4973fce357923fc1d469ca40
-#+getent.5d02dd9936859c0934ac274ca67387f92ecdd1b8dd624780d1e66b8a0f1f6342
-#+getconf.e3e283909e0a75a7691fde52f2a106783bfc99d9681720504377f8941075b6f8
-#+iconv.03f207b11724b6a9bb95e7677ec30770b2a30a21c09a2c09e79e30e0a10c7543
-#+libcap.0d360516e5086192b93754e08efffd72f6504af56d8a514a460fa42589cbf1a0
-#+applyuidgid-caps.336a5f45a3827cb86627163f318e360c670c7f57503878429e2870c0e7b81ae4
-#+ccx-utils.41274c253c01733750843bcd46eb5249e9397567936f222486ee5ba7518e87e1
-#+user-env.44f719ee5f6b348d0716b59adb3a89177f02dabeacb7637c6fef61565fd016e9
-#+strace.1dab6a0c2ed12be76527361a57b6ff6ea106fb5f17fed8798011d9182f06f5b8
-#+mlog.235369627809906a4e7547f28f9f71a5501901d63e418e2ec16cbd56c98c444b
-#+findutils.9fd553f92b4bd2e599b436a04e922d94f84e76db439e0b4051e75e7017bee41c
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66
-#+squashfs-tools.f37311d0f4e9165b72d1a677ff480ce911fb5e75ee4c5e21178cb5d5d2a84a4d
-#+mandoc.fcc7b1db23a3d62d70a612ae7eaa28fd3746318050e01948a60302699368bac3
-#+tinyssh.e5dade58f968cf39d110ee1682294e68326f94679ccccc3c4a8344ffbdb4469a
-#+system-config.c8ae49cd728a0e1d093089db367ce4cbdca818375dd8412bcb8a2c9cbe957fba
-#+system-config-rc.10c55a4dc106b0041f8a796f999f230a08607da8e90278790c49272acc3ded4a
-#+system-config-scripts.220da4d47f716f446380697c9d2ade9e5b469539bed963cbc301ef1805d68c43
-#+system-config-init.a0d2fa3a3131630bd309fa6ed7c3f1f83d988ca563ff377bf182bc9abae12605
-#+system-config-zsh.fe7b25e96661b4a6c00a5626faaccfb30d4ce51882514ca8808a43161f9f9490
-#+busybox.33ebb9ca3f37c043a7221c04d7f94cafb8a7e63b2986682b1ae20e0b31e6411e-
\ No newline at end of file
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-dosfstools.53e30486c6e40b854611e47e94c0dfa06c41691311cbbbaa290331b3d28cfb05
+#+busybox-e2fsprogs.a9db189743f4ef5ee540c2adc08214fe94a6ff732c50e02ae4c623706c246f7c
+#+busybox-iproute2.d538589972980a1e3a52e4830949ced1c22e0050b1ff57762b2972063ad91648
+#+busybox-iputils.8cbd732f5342bf8da8c1456cffb23554dbafa6fb19f8c6a19f1b67aaa243a662
+#+busybox-net-misc.eb9c09a2d8c9518a4cd038571adf312cfdc3e57eeed4e74db8e78c347ec68853
+#+busybox-net-tools.c82b35e4e8c518b44444f68f0cf50f4a2c01b6eb95a8983e0d9d7814d198f32a
+#+busybox-traceroute.2429ce3a0c431dadfc0668d60fb13d4a7fca2d5d16ade42ffecf36ce4f89baa0
+#+busybox-wget.ce90f68067c9539751edd9e2cca3be07bf15075ee1c690d4062a1bf226d342b0
+#+busybox-chpst.af71fed1aff7bf86c69557b774db59b4fe36d7f778ef485410430918b19e6589
+#+busybox-console.397dca7c32183b4b0aadb656e390e9529f79f8d40b50a956d843e889279edc28
+#+busybox-getty.a336c850d60eb7c5c7ec1db78052c3580a5a4044a04c32b744ea5107a2c1ce58
+#+busybox-i2c-tools.0fd529f075289fdbaa0bc73d49a1bef6af00e83fbb7117c16b8db087531ac0f8
+#+busybox-linux-extra.24d1b6d1976c35b6fd60dcbad716cadd30c6c1809ea38356b44646bbcd41ac57
+#+busybox-mtd-utils.d71bc206f11ac28fc084056ad5b582b7644d62689fa8e1af63812a322411af3e
+#+busybox-shadow.5e755181d3b2dfda29acbef0db527c6978db81962eb1cb0a330946aab63e0280
+#+busybox-su.3cdd99ba3237190df1dc8044384db002690ef70583173ee6fbc12d4a63891289
+#+busybox-util-linux-priv.f16ab2e2d7ebbc437fc8281906d240a776777ccd29a8fc1156fdd5d53aa4ba53
+#+busybox-logging.7fe744403efd37f85e6c2caf9b104a61d2d38d69c19bf1e099347468266747aa
+#+busybox-cron.2fce66542d321d6d2c9c9a6f2059b973cfc3d5ef5c06f9157ded14f79537ce59
+#+attr.e17aa90136701b1bd9e3586c39e3148cee87dd404a0e28d4c65cd4c345d5f867
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+diffutils.3ed82a2f49b3a332812cdaf5ce42937b7eaa7e7289ec7665a054c1990ae927af
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+flex.60e63266e21b63f26734c8d4776c87bbefc6b16938160c5c4b8302845d9d1134
+#+bison.6a4f2ce1cd5a32bcf0c34b1945baecfe20cba5b79f3c4a541c53e7e7c71d945c
+#+rsync.1b12bbbac109a1488d1c1baabd06ea32c13d04c356ee699d60c09158968bcee0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+s6-rc.fbb5af4ba6864263566fbfb101b7d822e8c77c7829c2455ef70fc17714727cb7
+#+s6-portable-utils.328d4e19549e0d61e320a5d082ee41208da820089457814de7bd35c6b6f8d99f
+#+s6-linux-utils.8527b26bae8aac43389702dcb32cee27f8fc01c1fe56ba729d2db8c3e9fcfa43
+#+s6-linux-init.9c14c94e915f263dc1c45378f2b4726a52abfa2ff4697d00167946bdb79c920e
+#+mdevd.3f0193774ce74e9cd78dadef55458588253a4679ec62c19efd656fba4d6146a8
+#+s6-dns.10f9dcad99bda42732f1e44bef4d1dddc940dcc329f4befbbd1fe91833da452a
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
+#+s6-networking.16fba46f37077dc7c66086e984e8c2718e62621fe14397603da6c3721ce3901f
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
+#+aat.01ac2532c116f85781ef3a544e82af471e03d7b9e5ab28196621bb9016fdbf05
+#+confz.638980c06bc1ab1c3a46c2dac87c4861404eb3a8936249430b28c77c8dc20130
+#+containers.3a73540556541ea75056b397c7b64be22dd87ae4ac0572e8360f1c5637a8901e
+#+fileset.2f03e2b9228c4de18829c4525c6752fe03888aaadba59a968004abad48a0810b
+#+logincaps.3e7f60ebb9a3830a643aa53683d858ab71ec25a8a91fc1ae9fa61257cb04369c
+#+snaprep.a43ec5e845611fe4e863956912c15f619e8e6f94e4815b37cb5473df5f5fabfb
+#+curl.33024ffb51a19b9b2209f22841b882041bf4b90dfc2cef22ce1f2f42d803730b
+#+git.171b024a1876bbdc321fe0cc9d45847cfbff43e6ac9a28e1548d90971ef5577b
+#+xbps.b14047f6b8e7ff5e4232a4e933dbaaa756ae5e5566b24a0ef227a464658a259d
+#+apk-tools.90720114fc824735c187ae6dfc800818e536d969fc83977cf3daa8e621890be4
+#+getent.d79f920cfbee726e830016b467c8bb87433f9a8a0ebaece3a1dc36d631e24209
+#+getconf.d90d9bef6e2866b0b9affcc7827de5996c3c9784dda1b44c416b4775242a7791
+#+iconv.bd80da5eeb70530bce5f0afa7963671d6a4d7f8803b1b8796d8934f0d07fd08c
+#+libcap.5cf43453236e91c96b9e5bd13cac766b502bc44ee5353add5935447da6705a7e
+#+applyuidgid-caps.e20a9573b922544197abbe5154be42d910438916fb3a143403e5dd1eef6d10d7
+#+ccx-utils.ef6e27392b3e3e9f98095dfcefff7cc22a4534be8e9bae6178b4f9d77017c0b0
+#+user-env.8f131ab0a227a4f0f0d27ee88faaab5a11196dd8679a312911e7943354a03dd5
+#+strace.606db7858b7800444c533852447076903afd199ed853aac0c0a6bd61f02ef059
+#+mlog.82418175ab4f7096bdd077178a4d1ee493bdf66a43e03e226a4716d326b45b04
+#+findutils.bedc671aaff0ca89c64416ce7b6779960420cc8c690b2fdd9e3e028c67af2bd3
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108
+#+squashfs-tools.c38bd905544ce454c66c26f3956716018e1471dc45a8271469f6d8d37d88d75a
+#+mandoc.5b34bc9da6be1b45a29acb7b988202f8f0a56d0562f49520fbad6b9d57a2693f
+#+tinyssh.cab0752a63fc0309b8e01fdb43c165f70440ecde3f4a46e261a3f4cea9d28100
+#+system-config.5b666a061ace662f25a5d6aaf83c5af39e5b76b34a95aee4e78ae978736d2624
+#+system-config-rc.d76dbd2dcba9c4f7303855a84effed8e4b4852d4402d15e3d375911736e00eea
+#+system-config-scripts.552ef52688e5a97b5d5bde3f2b45ccaab3a3f1320647dac70d91827f5b166b91
+#+system-config-init.9779a3f334126f199334d2ce95a0c505e5b0b63833f33c9dab1dbb5c0251b241
+#+system-config-zsh.0cb2df172a69cefaf77e4b1dc86b1b39233b11e5dbf85e25ac302ac8abffa248
+#+busybox.ca7665c6352143d50221853f3835b7baef00dac3c151cbd6cd2d05de3472f2ba+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -123,20 +123,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +49,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -122,22 +122,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+flex.d99904918d6a8605243d4e8c75e4c6866f8efa442c30e48fc8534a001abec6e9
-#+bison.7269fec828b34f75951079495c1bee4536d31586ca10fccf4450720c6cf4cba6
-#+libseccomp.0b69b3fa084dcf3ab0db2b95da80a86d32513905e4f204a05577224a6dbd928d
-#+error-standalone.2e7fe56863f91a80cdab5e42617e4d9ab6333c60bcfeed7de8986449243d5570
-#+argp-standalone.b1b2e9f7f5c682b7966414ca6d95d029bf1e44477ac8027e961e17bc6e554a4d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+flex.60e63266e21b63f26734c8d4776c87bbefc6b16938160c5c4b8302845d9d1134
+#+bison.6a4f2ce1cd5a32bcf0c34b1945baecfe20cba5b79f3c4a541c53e7e7c71d945c
+#+libseccomp.9709721a4dc2229cbf33ef0f664b0f8322274b809d11339ffcd21a05c0e4e259
+#+error-standalone.abb277b115d391b2f50ea2108e2d652995e4b64df10905d0737d0f2cc4c454a0
+#+argp-standalone.2b4d9a71775296c3f6c8656fd4c35b06271095152fa054b29220576f258fa9cd
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -130,20 +130,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
@@ -79,20 +79,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -89,20 +89,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/execline:bootstrap b/variants/ccx-x86_64/execline:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+skalibs.fa54c742f944d15f8c07d53f2421ed8d553f94ac3bf1a37157553181181dd45c
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+skalibs.eb349362a13d7c55aa797aca25867404c456ed72bd15fb817220628ccc7671cb
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -27,7 +27,7 @@ export CFLAGS="-O2 -ggdb"
 	--dynlibdir="${prefix}/library.so" \
 	--libdir="${prefix}/library" \
 	--includedir="${prefix}/include" \
-	--with-sysdeps='/home/ccx/versions/skalibs.fa54c742f944d15f8c07d53f2421ed8d553f94ac3bf1a37157553181181dd45c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.eb349362a13d7c55aa797aca25867404c456ed72bd15fb817220628ccc7671cb/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -61,20 +61,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
@@ -86,22 +86,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -132,20 +132,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -127,20 +127,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
-#+curl.ce3347b501eb872cb16c7aa0353f4b9af848a13363915ea8f4176f4a2436fe31
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
+#+curl.33024ffb51a19b9b2209f22841b882041bf4b90dfc2cef22ce1f2f42d803730b
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
@@ -104,20 +104,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/gnu-make:bootstrap b/variants/ccx-x86_64/gnu-make:bootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
+mcm=/home/ccx/versions/musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
@@ -78,20 +78,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -120,20 +120,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -126,20 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,3 +1,3 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.da0a328fdc3f60c8dbafd5c96804471afaff3df3022a1b1a8c6836f83b252463
-#+busybox.33ebb9ca3f37c043a7221c04d7f94cafb8a7e63b2986682b1ae20e0b31e6411e-
\ No newline at end of file
+#+linux-qemu-guest.e42986d0e927dec74d1dd581ed1de755c2b78a4af57cee45e58a88e796249d4a
+#+busybox.ca7665c6352143d50221853f3835b7baef00dac3c151cbd6cd2d05de3472f2ba+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -125,20 +125,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+libmd.e83330b085f7b3f67a7e1baa7b6b8002c0b01ffc15d5bd1e8ccf9fed70298470
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+libmd.3e301c861ae347bb7fb231ac18a7ecb85e890a98925024c903affa4a138a3bf7
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -121,20 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+pkgconf-pkg-config.a4abc7e539011e377d637bd41423bf7f1d68e50735c69c42cc11144aa694d188
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+pkgconf-pkg-config.cac9c462057ee1ddc2e06a84629e23bfefda47f2fc0b45b5ac9d951b62f5dd03
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -119,20 +119,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libcap:bootstrap b/variants/ccx-x86_64/libcap:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+flex.d99904918d6a8605243d4e8c75e4c6866f8efa442c30e48fc8534a001abec6e9
-#+bison.7269fec828b34f75951079495c1bee4536d31586ca10fccf4450720c6cf4cba6
-#+musl-fts.cb2358b896c6aafaccc9df282a163783e588fd27741cc7aebd65f4bde85a5b44
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+flex.60e63266e21b63f26734c8d4776c87bbefc6b16938160c5c4b8302845d9d1134
+#+bison.6a4f2ce1cd5a32bcf0c34b1945baecfe20cba5b79f3c4a541c53e7e7c71d945c
+#+musl-fts.65a45a9826dbaaea4c1de67c7bf7e16f36b817a9d37d27a3c818e67cc368f8e1
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -134,20 +134,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+zstd.18f8f8d6e42a094dc68f3dd9a0ce6bb09a5e3c9098c1928d859bb9883f7ce41b
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+zstd.a0e2c09721b9241e54cc7822207678a563fe1ecf957221a0ec316abe433b45a4
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
@@ -98,20 +98,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -121,20 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+ca-certificates-wip-donotuse.4c138100cfb78e4a6861cbf1e22f700a3b2af36eddef5b7bee7649c9f6ce17ff
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+ca-certificates-wip-donotuse.4fd545ab09d1ccd84d9e927242e63f416673d9df81793bf46d8728430ab29662
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -99,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.4c138100cfb78e4a6861cbf1e22f700a3b2af36eddef5b7bee7649c9f6ce17ff/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.4fd545ab09d1ccd84d9e927242e63f416673d9df81793bf46d8728430ab29662/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
@@ -148,20 +148,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+pkgconf-pkg-config.a4abc7e539011e377d637bd41423bf7f1d68e50735c69c42cc11144aa694d188
-#+gperf.3632898197bdd51556837a27bda0a023eb5cc43d8d84297836b902bcf7f1514f
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+pkgconf-pkg-config.cac9c462057ee1ddc2e06a84629e23bfefda47f2fc0b45b5ac9d951b62f5dd03
+#+gperf.866de7b8bdb7622c3f48f0a23e1e245d093553da5561e94f0ed5479dbc3fd510
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -126,20 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -126,20 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-modutils.468230bc830ba6d33b294ec075f215e0a145ea3d904d12fbf67d9b0d6bb29c27
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+findutils.9fd553f92b4bd2e599b436a04e922d94f84e76db439e0b4051e75e7017bee41c
-#+diffutils.54f2d772bd560d3366e9b2c6056b6b4c8963b144904b142565cec869f1406e32
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+flex.d99904918d6a8605243d4e8c75e4c6866f8efa442c30e48fc8534a001abec6e9
-#+bison.7269fec828b34f75951079495c1bee4536d31586ca10fccf4450720c6cf4cba6
-#+rsync.f72eca8c09ddccfaa9d9bad23b0c75527f5bbdc03cbb9b2ef142f74f1418d270
-#+zstd.18f8f8d6e42a094dc68f3dd9a0ce6bb09a5e3c9098c1928d859bb9883f7ce41b
-#+libelf.f08f274beb66120442333cd313fb98f1613a4e6bd68e4be26d7f56c100f4ed0f
-#+pkgconf-pkg-config.a4abc7e539011e377d637bd41423bf7f1d68e50735c69c42cc11144aa694d188
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-modutils.38ece43a943d57be4dca67d935b9c7577c922f361039446a4db8b07f3bd0db51
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+findutils.bedc671aaff0ca89c64416ce7b6779960420cc8c690b2fdd9e3e028c67af2bd3
+#+diffutils.3ed82a2f49b3a332812cdaf5ce42937b7eaa7e7289ec7665a054c1990ae927af
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+flex.60e63266e21b63f26734c8d4776c87bbefc6b16938160c5c4b8302845d9d1134
+#+bison.6a4f2ce1cd5a32bcf0c34b1945baecfe20cba5b79f3c4a541c53e7e7c71d945c
+#+rsync.1b12bbbac109a1488d1c1baabd06ea32c13d04c356ee699d60c09158968bcee0
+#+zstd.a0e2c09721b9241e54cc7822207678a563fe1ecf957221a0ec316abe433b45a4
+#+libelf.40942ff787cb18b3aee0e584480459a71797b1f05484b06872030dba5e3ded72
+#+pkgconf-pkg-config.cac9c462057ee1ddc2e06a84629e23bfefda47f2fc0b45b5ac9d951b62f5dd03
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
@@ -124,20 +124,29 @@ function mod_path(s) {
 }
 $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-modutils.468230bc830ba6d33b294ec075f215e0a145ea3d904d12fbf67d9b0d6bb29c27
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+findutils.9fd553f92b4bd2e599b436a04e922d94f84e76db439e0b4051e75e7017bee41c
-#+diffutils.54f2d772bd560d3366e9b2c6056b6b4c8963b144904b142565cec869f1406e32
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+flex.d99904918d6a8605243d4e8c75e4c6866f8efa442c30e48fc8534a001abec6e9
-#+bison.7269fec828b34f75951079495c1bee4536d31586ca10fccf4450720c6cf4cba6
-#+rsync.f72eca8c09ddccfaa9d9bad23b0c75527f5bbdc03cbb9b2ef142f74f1418d270
-#+zstd.18f8f8d6e42a094dc68f3dd9a0ce6bb09a5e3c9098c1928d859bb9883f7ce41b
-#+libelf.f08f274beb66120442333cd313fb98f1613a4e6bd68e4be26d7f56c100f4ed0f
-#+pkgconf-pkg-config.a4abc7e539011e377d637bd41423bf7f1d68e50735c69c42cc11144aa694d188
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-modutils.38ece43a943d57be4dca67d935b9c7577c922f361039446a4db8b07f3bd0db51
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+findutils.bedc671aaff0ca89c64416ce7b6779960420cc8c690b2fdd9e3e028c67af2bd3
+#+diffutils.3ed82a2f49b3a332812cdaf5ce42937b7eaa7e7289ec7665a054c1990ae927af
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+flex.60e63266e21b63f26734c8d4776c87bbefc6b16938160c5c4b8302845d9d1134
+#+bison.6a4f2ce1cd5a32bcf0c34b1945baecfe20cba5b79f3c4a541c53e7e7c71d945c
+#+rsync.1b12bbbac109a1488d1c1baabd06ea32c13d04c356ee699d60c09158968bcee0
+#+zstd.a0e2c09721b9241e54cc7822207678a563fe1ecf957221a0ec316abe433b45a4
+#+libelf.40942ff787cb18b3aee0e584480459a71797b1f05484b06872030dba5e3ded72
+#+pkgconf-pkg-config.cac9c462057ee1ddc2e06a84629e23bfefda47f2fc0b45b5ac9d951b62f5dd03
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
@@ -122,20 +122,29 @@ function mod_path(s) {
 }
 $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/lnstools:bootstrap b/variants/ccx-x86_64/lnstools:bootstrap
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+skalibs.fa54c742f944d15f8c07d53f2421ed8d553f94ac3bf1a37157553181181dd45c
-#+execline.a67ec8cef27b8bb37d8254d701842238fb92e0698e1bf3fe3c4ffa26a8691c76
-#+libcap.4cba321a444fbcd10a18657335a0a5bcba7d13a090614a7320d4b655d300c199
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+skalibs.eb349362a13d7c55aa797aca25867404c456ed72bd15fb817220628ccc7671cb
+#+execline.a34183dca5ffc176111aaf61601105ecbabac5489f3c0811cd0faa9faa9c877f
+#+libcap.64eb270f16c06706f7a5d0e1a530ad7a916fa007a20dcb5b6f6c1b3ff171dc4c
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
@@ -60,20 +60,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ccx-utils.41274c253c01733750843bcd46eb5249e9397567936f222486ee5ba7518e87e1
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ccx-utils.ef6e27392b3e3e9f98095dfcefff7cc22a4534be8e9bae6178b4f9d77017c0b0
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
@@ -121,22 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -120,20 +120,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
@@ -113,20 +113,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -82,20 +82,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment
@@ -1,51 +1,51 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-dosfstools.85265e825ae5e83cb7ef1f8e8c37509b8de118a1ab5d63035b14bccd8655266e
-#+busybox-e2fsprogs.2248b9ee6634404aea167b90741007bf4a8e52de081def33cb41bfa3f63958d1
-#+busybox-iproute2.a2c7f4d57fdfeea95298b0e2be848b9512f3df3442922de5db5053bc5c9bffd9
-#+busybox-iputils.784abb3101c331fbe4418d365b8ec6fc49a2bbd2cc5c29d1f0f66c15f1e4947a
-#+busybox-net-misc.ebc1d13bfb08e44175582391bc984df4c81608fa66d615d59e2b108916a64d19
-#+busybox-net-tools.337778bb47c51371173ce977d7b5e3a378b74fd09fc6a52da56cd092ecae8453
-#+busybox-traceroute.4dab80dd286d621ed36681ebccee1a3ac1d005197dc01c707f11b8bce0f85c31
-#+busybox-wget.2410b3d8c37c4265f4e042352876502e96c666417f06b8496f2a53709cc883c7
-#+busybox-chpst.93e91c224002624056af2e2d4bdf7a0f394f2fc6fa0d5ee38a4c21b944814921
-#+busybox-console.0c8afa6c2060ce6d5827715aa54cd1f083fb509484142fad80d2f962cf49cb55
-#+busybox-getty.8767092bb4cba017e07d358949575fa77f8c5ea7394102d67a6268e867f1962d
-#+busybox-i2c-tools.0eb043f1ba88f3d459f00698f86f8f8ffd80ae8c2fc0d7d22fe5d5bd07932261
-#+busybox-linux-extra.59751c34e54d157f91ae1b1c408b78cd900b1a04cec9cec31bcb8850e3816231
-#+busybox-mtd-utils.cde3695812ff988954694ba606d8a4455c6e96a81b775b732d1a3ed097d87f3a
-#+busybox-shadow.2bac52bc1122d66e84a9cd22a3a627eaa963013524f99bb85421918aed0cd026
-#+busybox-su.021a194c14730d11718269e924bdb40be96368f5a2a783cbf024691619af0aaf
-#+busybox-util-linux-priv.0963da9601439f24ce716a1a4a1dc771d9b2df8358be065326f531456fac848c
-#+busybox-logging.ce834cd221dfcc14ec2d50035dc958fcd82c38484eec994888258738454c372b
-#+busybox-cron.0942ef686004d2a839d1d7351b6f81101c924098955d0be3db6cd3af657c700c
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+mdev-scripts.0142f00343011c355f2c312214a426699a93786853e07bdeb8c3720d34afef78
-#+mdevd.2ad5582d1a920ad8114f4110ed6244bd0033ff862ef92b3f477d24e33d1965be
-#+busybox.33ebb9ca3f37c043a7221c04d7f94cafb8a7e63b2986682b1ae20e0b31e6411e-
\ No newline at end of file
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-dosfstools.53e30486c6e40b854611e47e94c0dfa06c41691311cbbbaa290331b3d28cfb05
+#+busybox-e2fsprogs.a9db189743f4ef5ee540c2adc08214fe94a6ff732c50e02ae4c623706c246f7c
+#+busybox-iproute2.d538589972980a1e3a52e4830949ced1c22e0050b1ff57762b2972063ad91648
+#+busybox-iputils.8cbd732f5342bf8da8c1456cffb23554dbafa6fb19f8c6a19f1b67aaa243a662
+#+busybox-net-misc.eb9c09a2d8c9518a4cd038571adf312cfdc3e57eeed4e74db8e78c347ec68853
+#+busybox-net-tools.c82b35e4e8c518b44444f68f0cf50f4a2c01b6eb95a8983e0d9d7814d198f32a
+#+busybox-traceroute.2429ce3a0c431dadfc0668d60fb13d4a7fca2d5d16ade42ffecf36ce4f89baa0
+#+busybox-wget.ce90f68067c9539751edd9e2cca3be07bf15075ee1c690d4062a1bf226d342b0
+#+busybox-chpst.af71fed1aff7bf86c69557b774db59b4fe36d7f778ef485410430918b19e6589
+#+busybox-console.397dca7c32183b4b0aadb656e390e9529f79f8d40b50a956d843e889279edc28
+#+busybox-getty.a336c850d60eb7c5c7ec1db78052c3580a5a4044a04c32b744ea5107a2c1ce58
+#+busybox-i2c-tools.0fd529f075289fdbaa0bc73d49a1bef6af00e83fbb7117c16b8db087531ac0f8
+#+busybox-linux-extra.24d1b6d1976c35b6fd60dcbad716cadd30c6c1809ea38356b44646bbcd41ac57
+#+busybox-mtd-utils.d71bc206f11ac28fc084056ad5b582b7644d62689fa8e1af63812a322411af3e
+#+busybox-shadow.5e755181d3b2dfda29acbef0db527c6978db81962eb1cb0a330946aab63e0280
+#+busybox-su.3cdd99ba3237190df1dc8044384db002690ef70583173ee6fbc12d4a63891289
+#+busybox-util-linux-priv.f16ab2e2d7ebbc437fc8281906d240a776777ccd29a8fc1156fdd5d53aa4ba53
+#+busybox-logging.7fe744403efd37f85e6c2caf9b104a61d2d38d69c19bf1e099347468266747aa
+#+busybox-cron.2fce66542d321d6d2c9c9a6f2059b973cfc3d5ef5c06f9157ded14f79537ce59
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+mdev-scripts.aec7364a57b399845ac234c6cfbf17f52b411eb41a1dd3ad40c07877b756e85b
+#+mdevd.3f0193774ce74e9cd78dadef55458588253a4679ec62c19efd656fba4d6146a8
+#+busybox.ca7665c6352143d50221853f3835b7baef00dac3c151cbd6cd2d05de3472f2ba+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
@@ -95,20 +95,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/musl-cross-make b/variants/ccx-x86_64/musl-cross-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -130,20 +130,29 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 # $2 == "x86_64-linux-musl" && $3 == "include" { link(r1($0)) }
 $2 == "x86_64-linux-musl" && $3 == "include" && $4 == "linux" { link(s1("include", r1($0))) }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-0 b/variants/ccx-x86_64/musl-cross-make:bootstrap-0
@@ -81,20 +81,29 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 # $2 == "x86_64-linux-musl" && $3 == "include" { link(r1($0)) }
 $2 == "x86_64-linux-musl" && $3 == "include" && $4 == "linux" { link(s1("include", r1($0))) }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-1 b/variants/ccx-x86_64/musl-cross-make:bootstrap-1
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.2d20f08daafd0eb18b3eac38bdf06a6520f8e69680df539d1ccb6af1bb41b96a
+#+musl-cross-make.40efe61b4526119ce4630f75e1626a23beab8a94ec28b2754b9a172829e4e029
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -21,7 +21,7 @@ prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
-bootstrap=/home/ccx/versions/musl-cross-make.2d20f08daafd0eb18b3eac38bdf06a6520f8e69680df539d1ccb6af1bb41b96a
+bootstrap=/home/ccx/versions/musl-cross-make.40efe61b4526119ce4630f75e1626a23beab8a94ec28b2754b9a172829e4e029
 "$bootstrap/bin/x86_64-linux-musl-gcc" --version
 
 cat >musl-cross-make/config.mak <<EOF
@@ -90,20 +90,29 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 # $2 == "x86_64-linux-musl" && $3 == "include" { link(r1($0)) }
 $2 == "x86_64-linux-musl" && $3 == "include" && $4 == "linux" { link(s1("include", r1($0))) }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
@@ -92,20 +92,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+bison.7269fec828b34f75951079495c1bee4536d31586ca10fccf4450720c6cf4cba6
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+bison.6a4f2ce1cd5a32bcf0c34b1945baecfe20cba5b79f3c4a541c53e7e7c71d945c
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
@@ -71,20 +71,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
@@ -84,20 +84,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
-#+ocaml_intrinsics_kernel.0835c1fc77955da594dc52701ebb54671a9e58b1c3f0911d9cc3a8f2f520a2e6
-#+ocaml-sexplib0.ff584961eb8f28d9c2c27aa1ef26ae1c58bc688163f824f7c0950f7e1b72497b
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
+#+ocaml_intrinsics_kernel.67d18c9b717d1d5ffbfed1abee06a136b575757bc969c697bd57597ab43beea2
+#+ocaml-sexplib0.79ffb7cb30441d101960cbc3eae21c495fc30f25c8502a4b19db46fd68e7c9a3
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
@@ -95,22 +95,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
-#+ocaml-astring.a99e61a24a945f106d70402d9c6801127ffb80f2330ad8205835541f9588bce1
-#+ocaml-fpath.bec76008bc909e3cc831c1b61f47764a6f8d63a83507aa528eab97f1179008e6
-#+ocaml-rresult.a8633da5c7e896d01845a583a0b32689778898d7aa05d7deeafe04acc8324540
-#+ocaml-fmt.316a10327393bbb8b1ac3701c6145b279d22e904afae234d3421c5caea01300a
-#+ocaml-logs.dd41ac8645ed2dfd1b80fd6e114747bd21b89cfe11de8d7f3ab5885b7f9d92dd
-#+ocaml-mtime.c683b5397699f605843930af9f0bf980b8081a19a2c8a8f051370a80861fb1ae
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
+#+ocaml-astring.91fd3599621e44050b5a724d35103deb2d6364602e83e3fe1ef8b3b0b7dbc03d
+#+ocaml-fpath.d9457aa6da1a02c51ec17f1f4da8ec9b8b55d265802170d8d17b9b1e998d0fe1
+#+ocaml-rresult.93e294f53c9a24a446d087911a4e046f8865dbd310776c44d45b5183e4767ff3
+#+ocaml-fmt.bf31992a570e4cf8b8a14f1b7a874f950d5b2fdd64817e8d6fe5a7bc67f521f8
+#+ocaml-logs.b317c79ec70dee71bfe7c8b12dc72d607993f94a182ae5b389d5a7d518046179
+#+ocaml-mtime.e7ee3268d6a079db24b94b420e0ffc68408724de890c483ca4675a57e4d534c8
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
@@ -94,22 +94,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
@@ -91,22 +91,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+netbsd-curses.6bf0eaccda32bdf1660f137c0a6a8f656dd5cf86f073501ef701ecc5cdbdd903
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+netbsd-curses.1c82038b7c0c9b2d60fbdce942dcc5e045aa68fa243df2d6c47cdec91beeadfd
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
@@ -125,22 +125,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
-#+ocaml-cmdliner.e440c7630d53709c1f54dc17fecaee80c096880b90a881c67e66ef2fe121e64c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
+#+ocaml-cmdliner.1c86f6dd7f1dfaed74fdbc7d1ed2d4a9026d301decec49c1394abed50fae3a28
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
@@ -89,22 +89,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
-#+ocaml-astring.a99e61a24a945f106d70402d9c6801127ffb80f2330ad8205835541f9588bce1
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
+#+ocaml-astring.91fd3599621e44050b5a724d35103deb2d6364602e83e3fe1ef8b3b0b7dbc03d
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
@@ -89,22 +89,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
-#+ocaml-mtime.c683b5397699f605843930af9f0bf980b8081a19a2c8a8f051370a80861fb1ae
-#+ocaml-cmdliner.e440c7630d53709c1f54dc17fecaee80c096880b90a881c67e66ef2fe121e64c
-#+ocaml-fmt.316a10327393bbb8b1ac3701c6145b279d22e904afae234d3421c5caea01300a
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
+#+ocaml-mtime.e7ee3268d6a079db24b94b420e0ffc68408724de890c483ca4675a57e4d534c8
+#+ocaml-cmdliner.1c86f6dd7f1dfaed74fdbc7d1ed2d4a9026d301decec49c1394abed50fae3a28
+#+ocaml-fmt.bf31992a570e4cf8b8a14f1b7a874f950d5b2fdd64817e8d6fe5a7bc67f521f8
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
@@ -94,22 +94,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
-#+ocaml-compiler-libs.42a9d1b03382c132addb2aeea9cbf0e906e34bb06884aec442e4b0bb55e38baa
-#+ocaml-cppo.50d35b78616088fe427e37a4c2f999f61fdde58223f5e8dce2fb644774304f73
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocaml-ppx_derivers.3990b53890b8e0f0aabf0a80fe7aa94891ac424557886aa5bbf097c212f7709d
-#+ocaml-ppxlib.b8ca2c650066138522f7168a37e47b45c19f49bca60653ddafe1b912c5de7688
-#+ocaml-sexplib0.ff584961eb8f28d9c2c27aa1ef26ae1c58bc688163f824f7c0950f7e1b72497b
-#+ocaml-stdlib-shims.72ac10a261d58f6a9d29c7dcc2d9ddd0beef63d3f535cea58d6fcd2ace68845c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
+#+ocaml-compiler-libs.11b8c96440bf51287244a10557e1bbda9581261669889c06943489055328c455
+#+ocaml-cppo.b506b20ec7847e48eb27050171932722a6fdfd19945ef5916f6a23eb3be388e6
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocaml-ppx_derivers.64bfedbd03e08044153dece87ae5576b0ce199e3f088163d77ad3e54359ebfa9
+#+ocaml-ppxlib.bbbdefa2634019d634aa3906a0deb178bfdc08d2bd31c8c09d0680f857462ada
+#+ocaml-sexplib0.79ffb7cb30441d101960cbc3eae21c495fc30f25c8502a4b19db46fd68e7c9a3
+#+ocaml-stdlib-shims.0046680a486fc0eacca036a85e6d48136e9ac56104b657dbc913bb783dc5796a
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
@@ -98,22 +98,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
-#+ocaml-compiler-libs.42a9d1b03382c132addb2aeea9cbf0e906e34bb06884aec442e4b0bb55e38baa
-#+ocaml-ppx_derivers.3990b53890b8e0f0aabf0a80fe7aa94891ac424557886aa5bbf097c212f7709d
-#+ocaml-sexplib0.ff584961eb8f28d9c2c27aa1ef26ae1c58bc688163f824f7c0950f7e1b72497b
-#+ocaml-stdlib-shims.72ac10a261d58f6a9d29c7dcc2d9ddd0beef63d3f535cea58d6fcd2ace68845c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
+#+ocaml-compiler-libs.11b8c96440bf51287244a10557e1bbda9581261669889c06943489055328c455
+#+ocaml-ppx_derivers.64bfedbd03e08044153dece87ae5576b0ce199e3f088163d77ad3e54359ebfa9
+#+ocaml-sexplib0.79ffb7cb30441d101960cbc3eae21c495fc30f25c8502a4b19db46fd68e7c9a3
+#+ocaml-stdlib-shims.0046680a486fc0eacca036a85e6d48136e9ac56104b657dbc913bb783dc5796a
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-topkg.d237316f6a7c1d41c38938ca0de21da53137bbe3f6f01a13a1451e98b406d225
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-topkg.b53ca3b676c9bdf32377ab4d0d9ad874a2dca4cc02c89020def50629a014e027
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
@@ -91,22 +91,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
@@ -90,22 +90,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+ocaml-findlib.699481cb6b469ee611cb74140e0d617771b6252efba8070ee12f72005afc17cb
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+ocaml-findlib.e8e329357720d6f744bc5e6beaebc10adb7936a80dea7ba22f12e60008ff66b1
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
@@ -87,22 +87,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml.environment b/variants/ccx-x86_64/ocaml.environment
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
-#+ocamlbuild.27e80d5ada210ce318bfb5231bec66f007c03e1babe1b2d7b12932925124c205
-#+ocaml-base.94aa03545430fca1fd3fb9597841d0b2c2c53de438dac48a6eea57f5d49f4271
-#+opam.d9cc627efbec23d61c38c789c93c687c9bacab745898b0cb364027b9e0b9bb3e
-#+ocaml-bos.c46b8f6b5f05772a17c50a8753a3f2cd30cd4690c47cb4410284d693d678b243
-#+ocaml-lun.35f5d55bc694c8512cc5ffcae2d65a2c3a370d865b34201bd6f07c84d4473f5a
-#+ocaml-ppx_deriving.ccd35569598eaae56a914600ba065b13d6b25eb626577920b52fe856c595cca8-
\ No newline at end of file
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
+#+ocamlbuild.febacdbede3387a31d65af3ade2ee19db2b1973c118c4f0e8115bf83fa06c2e4
+#+ocaml-base.db25f3d4304509ff856af24874d1b9239b6685b37b4bb15f318e1bbf32bb3ca3
+#+opam.f9f38c11472183f976a09802167a8968fd943918c669a682521a15d6a9200727
+#+ocaml-bos.015f8274db7848a53fb3655e47e7d8c919b56a1aae92c3267e69a40cc3344d99
+#+ocaml-lun.c458386e2514d1de8e969b7abb04207b9ae1d3509584e534fbfe20cb0a187a88
+#+ocaml-ppx_deriving.90809814fd511b3b64e3dd1d46cc94157956e23e02c6fc7c5c8d40cb5d8ae640+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -107,23 +107,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
+$2 == "env" { link($0); next }
 $2 == ".env-template" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "env" { link($0); next }
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
@@ -84,22 +84,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
@@ -110,22 +110,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+diffutils.54f2d772bd560d3366e9b2c6056b6b4c8963b144904b142565cec869f1406e32
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+getconf.e3e283909e0a75a7691fde52f2a106783bfc99d9681720504377f8941075b6f8
-#+ocaml.1b28b3deccf08a87dd1f25da56aef2e36810318593dbb0631fb621faf677f596
-#+dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+diffutils.3ed82a2f49b3a332812cdaf5ce42937b7eaa7e7289ec7665a054c1990ae927af
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+getconf.d90d9bef6e2866b0b9affcc7827de5996c3c9784dda1b44c416b4775242a7791
+#+ocaml.786a5a4349c7286b35211f9f67b277a88aff1631b881fc8eb583a2144a97712c
+#+dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/home/ccx/versions/dune.0639e04ffbbcdf37e6658b931007a54c941ad584d60a58780805f49b49801720/command/dune' \
+	--with-dune='/home/ccx/versions/dune.a08cc8f1000d598f4facf697476c888523a3572d75d24b52710aa1c63eb34974/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
@@ -115,22 +115,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -121,20 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -126,20 +126,29 @@ $1!="."{exit 1}
 
 $2 == ".env-template" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config
@@ -1,31 +1,31 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+pkgconf.e9e06710e3107d13c8d6872574d1576ee1f774c6f1141c38a05fb94945ef05db
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+pkgconf.a99ba00fba732be2202694e663963ff695b4c99a9dc9bbccd1f5017a4bf8b7d4
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -120,20 +120,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
@@ -66,20 +66,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+execline.a67ec8cef27b8bb37d8254d701842238fb92e0698e1bf3fe3c4ffa26a8691c76
-#+lnstools.4b9fd1b14aea5909d17dcbb61ba8f5fbb61a7a2137607d439755dca086450906
-#+sandbox_rootfs.6b7a6b01370ca60fee03cd486d41760a9bd5389ae195c6d689b9e7160398f843
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+execline.a34183dca5ffc176111aaf61601105ecbabac5489f3c0811cd0faa9faa9c877f
+#+lnstools.99202cdc9c47110620db448d1125c0e3881cccbeefdabc664b9ab6be396aaa51
+#+sandbox_rootfs.271b44ad939446e2620149d64589b7bc33b6001b0e003f3a0f87320aa5a1ad79
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c:sandbox-rootns.in
 
diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66
-#+popt.74f5b3c4375be8c1b4213b308d84dd6d1c4195fb2229f9f8924de20a8e9d25c4
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
-#+zstd.18f8f8d6e42a094dc68f3dd9a0ce6bb09a5e3c9098c1928d859bb9883f7ce41b
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108
+#+popt.34aaf6ac5c5c677c9452a4d0588ca0f85228552148d13388a5ce73787bb5632d
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
+#+zstd.a0e2c09721b9241e54cc7822207678a563fe1ecf957221a0ec316abe433b45a4
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -130,20 +130,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -82,20 +82,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -81,20 +81,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -83,20 +83,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -81,20 +81,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+s6-dns.401ef3a77db8adaeb99591606c8f6e8540058147af984c975bb1d81d5cb79d16
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+s6-dns.10f9dcad99bda42732f1e44bef4d1dddc940dcc329f4befbbd1fe91833da452a
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -90,20 +90,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -81,20 +81,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.2c18b9493cbe91da6048ee8dccad560c9ee082b696357e1ef3e307a82660ff53/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.c1918a5934804386f2db4c82d01756bb97b98a9f6cb69127ef93d858742039d0/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -83,20 +83,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/sandbox_rootfs b/variants/ccx-x86_64/sandbox_rootfs
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
-#+skalibs.fa54c742f944d15f8c07d53f2421ed8d553f94ac3bf1a37157553181181dd45c
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
+#+skalibs.eb349362a13d7c55aa797aca25867404c456ed72bd15fb817220628ccc7671cb
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
diff --git a/variants/ccx-x86_64/sandbox_rootns.environment b/variants/ccx-x86_64/sandbox_rootns.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.4b9fd1b14aea5909d17dcbb61ba8f5fbb61a7a2137607d439755dca086450906
-#+sandbox_rootfs.6b7a6b01370ca60fee03cd486d41760a9bd5389ae195c6d689b9e7160398f843
-#+pthbs-sandbox-rootns.e895be7c3462dfdf23498372e65d0f951bbbbe4e35f5fe3f33d5cf6f3f2c88a7-
\ No newline at end of file
+#+lnstools.99202cdc9c47110620db448d1125c0e3881cccbeefdabc664b9ab6be396aaa51
+#+sandbox_rootfs.271b44ad939446e2620149d64589b7bc33b6001b0e003f3a0f87320aa5a1ad79
+#+pthbs-sandbox-rootns.1b37ec108dcfb6af6f942ab09c060f45f858d26fa830a8e967d5f762af70b7eb+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -83,20 +83,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/skalibs:bootstrap b/variants/ccx-x86_64/skalibs:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.96b3ad2c8a8de2399c8c82397515b3b089df18114d1450964129ebaca4a89ebd
-#+gnu-make.a45dd1f7545f0a89839cb6d89807d3f2cd57c61e9f6c4f00f2b6f421d145b46e
-#+busybox.38e6dd2730d11c8734fb66d3bf87e43c4f5293cd5ebe8f9764ed31764bcb11bf
+#+musl-cross-make.e69cc40cf9ae56dd16631fce5539085731f52416a7d1d516527d380c8d07d288
+#+gnu-make.e3d6b20c707a4bba0500cdaa9ace619984f1c4c203cc8b5f7519ac21d5ca3282
+#+busybox.6b0507d680f9bb71ecf1ac12f77c3205344029cd37f5b0ce1e7ff0ba436d599d
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -56,20 +56,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
@@ -85,22 +85,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+attr.285118da456b4e3be682bab584b9a8fa8240094bc691604a77ae209aac3a40c9
-#+zstd.18f8f8d6e42a094dc68f3dd9a0ce6bb09a5e3c9098c1928d859bb9883f7ce41b
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+attr.e17aa90136701b1bd9e3586c39e3148cee87dd404a0e28d4c65cd4c345d5f867
+#+zstd.a0e2c09721b9241e54cc7822207678a563fe1ecf957221a0ec316abe433b45a4
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
@@ -122,20 +122,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+libunwind.14b5052929e44e71426761083c71c1afa67cf8f28682e908dc11fe6f5d84bcbd
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+libunwind.948a0ed02faebd7a715b5b188ac106e80ceb3ac30dc47c96b5334a568c3ebcc6
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -129,20 +129,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -1,67 +1,67 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-dosfstools.85265e825ae5e83cb7ef1f8e8c37509b8de118a1ab5d63035b14bccd8655266e
-#+busybox-e2fsprogs.2248b9ee6634404aea167b90741007bf4a8e52de081def33cb41bfa3f63958d1
-#+busybox-iproute2.a2c7f4d57fdfeea95298b0e2be848b9512f3df3442922de5db5053bc5c9bffd9
-#+busybox-iputils.784abb3101c331fbe4418d365b8ec6fc49a2bbd2cc5c29d1f0f66c15f1e4947a
-#+busybox-net-misc.ebc1d13bfb08e44175582391bc984df4c81608fa66d615d59e2b108916a64d19
-#+busybox-net-tools.337778bb47c51371173ce977d7b5e3a378b74fd09fc6a52da56cd092ecae8453
-#+busybox-traceroute.4dab80dd286d621ed36681ebccee1a3ac1d005197dc01c707f11b8bce0f85c31
-#+busybox-wget.2410b3d8c37c4265f4e042352876502e96c666417f06b8496f2a53709cc883c7
-#+busybox-chpst.93e91c224002624056af2e2d4bdf7a0f394f2fc6fa0d5ee38a4c21b944814921
-#+busybox-console.0c8afa6c2060ce6d5827715aa54cd1f083fb509484142fad80d2f962cf49cb55
-#+busybox-getty.8767092bb4cba017e07d358949575fa77f8c5ea7394102d67a6268e867f1962d
-#+busybox-i2c-tools.0eb043f1ba88f3d459f00698f86f8f8ffd80ae8c2fc0d7d22fe5d5bd07932261
-#+busybox-linux-extra.59751c34e54d157f91ae1b1c408b78cd900b1a04cec9cec31bcb8850e3816231
-#+busybox-mtd-utils.cde3695812ff988954694ba606d8a4455c6e96a81b775b732d1a3ed097d87f3a
-#+busybox-shadow.2bac52bc1122d66e84a9cd22a3a627eaa963013524f99bb85421918aed0cd026
-#+busybox-su.021a194c14730d11718269e924bdb40be96368f5a2a783cbf024691619af0aaf
-#+busybox-util-linux-priv.0963da9601439f24ce716a1a4a1dc771d9b2df8358be065326f531456fac848c
-#+busybox-logging.ce834cd221dfcc14ec2d50035dc958fcd82c38484eec994888258738454c372b
-#+busybox-cron.0942ef686004d2a839d1d7351b6f81101c924098955d0be3db6cd3af657c700c
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66
-#+diffutils.54f2d772bd560d3366e9b2c6056b6b4c8963b144904b142565cec869f1406e32
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+aat.b98e04d9aa274220ed7300725ed3549ecbbefd647bb173214f3c3aea431d505a
-#+fileset.5f7665e33232f7be0b4d12bdf6e4be6b9e23402e11a1c5c1dbec16173b343533
-#+rsync.f72eca8c09ddccfaa9d9bad23b0c75527f5bbdc03cbb9b2ef142f74f1418d270
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+kbd.a22b0441d2dec08f6a0dc329edb6453dd9ad510544b51bba7d5f09560c2b8411
-#+mdevd.2ad5582d1a920ad8114f4110ed6244bd0033ff862ef92b3f477d24e33d1965be
-#+s6-linux-utils.fe7aec6f035444375d4354c8d94d828d27014e879a4309129a1a07201ead60b0
-#+s6-rc.8a12474e2ad067516a8e6fd45a8850f134a67680b8e4348c5781cf6e29e4c249
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+libcgroup.d68fad2d2f774b01490e85bd3792db875ceba1a904c86fb01cb3d61780c054a4
-#+system-config-scripts.220da4d47f716f446380697c9d2ade9e5b469539bed963cbc301ef1805d68c43
-#+logincaps.a711ec9f87cc294cb22d71006aeac7c2aedf6a1563d734ac088cfb6e17cdf4b1
-#+busybox.33ebb9ca3f37c043a7221c04d7f94cafb8a7e63b2986682b1ae20e0b31e6411e
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-dosfstools.53e30486c6e40b854611e47e94c0dfa06c41691311cbbbaa290331b3d28cfb05
+#+busybox-e2fsprogs.a9db189743f4ef5ee540c2adc08214fe94a6ff732c50e02ae4c623706c246f7c
+#+busybox-iproute2.d538589972980a1e3a52e4830949ced1c22e0050b1ff57762b2972063ad91648
+#+busybox-iputils.8cbd732f5342bf8da8c1456cffb23554dbafa6fb19f8c6a19f1b67aaa243a662
+#+busybox-net-misc.eb9c09a2d8c9518a4cd038571adf312cfdc3e57eeed4e74db8e78c347ec68853
+#+busybox-net-tools.c82b35e4e8c518b44444f68f0cf50f4a2c01b6eb95a8983e0d9d7814d198f32a
+#+busybox-traceroute.2429ce3a0c431dadfc0668d60fb13d4a7fca2d5d16ade42ffecf36ce4f89baa0
+#+busybox-wget.ce90f68067c9539751edd9e2cca3be07bf15075ee1c690d4062a1bf226d342b0
+#+busybox-chpst.af71fed1aff7bf86c69557b774db59b4fe36d7f778ef485410430918b19e6589
+#+busybox-console.397dca7c32183b4b0aadb656e390e9529f79f8d40b50a956d843e889279edc28
+#+busybox-getty.a336c850d60eb7c5c7ec1db78052c3580a5a4044a04c32b744ea5107a2c1ce58
+#+busybox-i2c-tools.0fd529f075289fdbaa0bc73d49a1bef6af00e83fbb7117c16b8db087531ac0f8
+#+busybox-linux-extra.24d1b6d1976c35b6fd60dcbad716cadd30c6c1809ea38356b44646bbcd41ac57
+#+busybox-mtd-utils.d71bc206f11ac28fc084056ad5b582b7644d62689fa8e1af63812a322411af3e
+#+busybox-shadow.5e755181d3b2dfda29acbef0db527c6978db81962eb1cb0a330946aab63e0280
+#+busybox-su.3cdd99ba3237190df1dc8044384db002690ef70583173ee6fbc12d4a63891289
+#+busybox-util-linux-priv.f16ab2e2d7ebbc437fc8281906d240a776777ccd29a8fc1156fdd5d53aa4ba53
+#+busybox-logging.7fe744403efd37f85e6c2caf9b104a61d2d38d69c19bf1e099347468266747aa
+#+busybox-cron.2fce66542d321d6d2c9c9a6f2059b973cfc3d5ef5c06f9157ded14f79537ce59
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108
+#+diffutils.3ed82a2f49b3a332812cdaf5ce42937b7eaa7e7289ec7665a054c1990ae927af
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+aat.01ac2532c116f85781ef3a544e82af471e03d7b9e5ab28196621bb9016fdbf05
+#+fileset.2f03e2b9228c4de18829c4525c6752fe03888aaadba59a968004abad48a0810b
+#+rsync.1b12bbbac109a1488d1c1baabd06ea32c13d04c356ee699d60c09158968bcee0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+kbd.f2527e0ec288bac07dbd4a7b7a80c118bf352afb0388ab12b56d018d7d49a468
+#+mdevd.3f0193774ce74e9cd78dadef55458588253a4679ec62c19efd656fba4d6146a8
+#+s6-linux-utils.8527b26bae8aac43389702dcb32cee27f8fc01c1fe56ba729d2db8c3e9fcfa43
+#+s6-rc.fbb5af4ba6864263566fbfb101b7d822e8c77c7829c2455ef70fc17714727cb7
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+libcgroup.42fa8bf5c7e4ed2688eef360316d412f350d063e59f8e706bf293962635dd65b
+#+system-config-scripts.552ef52688e5a97b5d5bde3f2b45ccaab3a3f1320647dac70d91827f5b166b91
+#+logincaps.3e7f60ebb9a3830a643aa53683d858ab71ec25a8a91fc1ae9fa61257cb04369c
+#+busybox.ca7665c6352143d50221853f3835b7baef00dac3c151cbd6cd2d05de3472f2ba
 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config
 
 
@@ -98,8 +98,8 @@ printf '%s\n' >config/etc/skel/loginexec \
 chmod +x config/etc/skel/loginexec
 
 env 'pthbs_path_system-config'="$prefix" \
-	'pthbs_path_containers=/home/ccx/versions/env.736193dd549022e4bac68c3fe82a406c625eb370ace7dcd95a5736ba0bee98f0' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.5fe328c693572644aa16cbf56c7f2df3ef4e2f664e10e01d6b5af412462366cd' \
+	'pthbs_path_containers=/home/ccx/versions/env.8d6919571689463fa45f2a0d6f05e59f08b10c69c0e100c07035c9aa910724d1' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.d0d78c19bb0ca5bc3a4762fc30a996218184661bf1df88d3b6a479c47f1c9e86' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
@@ -150,20 +150,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -1,57 +1,57 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-dosfstools.85265e825ae5e83cb7ef1f8e8c37509b8de118a1ab5d63035b14bccd8655266e
-#+busybox-e2fsprogs.2248b9ee6634404aea167b90741007bf4a8e52de081def33cb41bfa3f63958d1
-#+busybox-iproute2.a2c7f4d57fdfeea95298b0e2be848b9512f3df3442922de5db5053bc5c9bffd9
-#+busybox-iputils.784abb3101c331fbe4418d365b8ec6fc49a2bbd2cc5c29d1f0f66c15f1e4947a
-#+busybox-net-misc.ebc1d13bfb08e44175582391bc984df4c81608fa66d615d59e2b108916a64d19
-#+busybox-net-tools.337778bb47c51371173ce977d7b5e3a378b74fd09fc6a52da56cd092ecae8453
-#+busybox-traceroute.4dab80dd286d621ed36681ebccee1a3ac1d005197dc01c707f11b8bce0f85c31
-#+busybox-wget.2410b3d8c37c4265f4e042352876502e96c666417f06b8496f2a53709cc883c7
-#+busybox-chpst.93e91c224002624056af2e2d4bdf7a0f394f2fc6fa0d5ee38a4c21b944814921
-#+busybox-console.0c8afa6c2060ce6d5827715aa54cd1f083fb509484142fad80d2f962cf49cb55
-#+busybox-getty.8767092bb4cba017e07d358949575fa77f8c5ea7394102d67a6268e867f1962d
-#+busybox-i2c-tools.0eb043f1ba88f3d459f00698f86f8f8ffd80ae8c2fc0d7d22fe5d5bd07932261
-#+busybox-linux-extra.59751c34e54d157f91ae1b1c408b78cd900b1a04cec9cec31bcb8850e3816231
-#+busybox-mtd-utils.cde3695812ff988954694ba606d8a4455c6e96a81b775b732d1a3ed097d87f3a
-#+busybox-shadow.2bac52bc1122d66e84a9cd22a3a627eaa963013524f99bb85421918aed0cd026
-#+busybox-su.021a194c14730d11718269e924bdb40be96368f5a2a783cbf024691619af0aaf
-#+busybox-util-linux-priv.0963da9601439f24ce716a1a4a1dc771d9b2df8358be065326f531456fac848c
-#+busybox-logging.ce834cd221dfcc14ec2d50035dc958fcd82c38484eec994888258738454c372b
-#+busybox-cron.0942ef686004d2a839d1d7351b6f81101c924098955d0be3db6cd3af657c700c
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+s6-rc.8a12474e2ad067516a8e6fd45a8850f134a67680b8e4348c5781cf6e29e4c249
-#+s6-portable-utils.3b835184b86cc4c003716d4116f583142f789b215afc24c9c3070f6b55280b7d
-#+s6-linux-init.654fd4a6fafc787dcd8aba606ea96a88c204e44f47ce98e11f7db6cd945757b6
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+system-config-rc.10c55a4dc106b0041f8a796f999f230a08607da8e90278790c49272acc3ded4a
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-dosfstools.53e30486c6e40b854611e47e94c0dfa06c41691311cbbbaa290331b3d28cfb05
+#+busybox-e2fsprogs.a9db189743f4ef5ee540c2adc08214fe94a6ff732c50e02ae4c623706c246f7c
+#+busybox-iproute2.d538589972980a1e3a52e4830949ced1c22e0050b1ff57762b2972063ad91648
+#+busybox-iputils.8cbd732f5342bf8da8c1456cffb23554dbafa6fb19f8c6a19f1b67aaa243a662
+#+busybox-net-misc.eb9c09a2d8c9518a4cd038571adf312cfdc3e57eeed4e74db8e78c347ec68853
+#+busybox-net-tools.c82b35e4e8c518b44444f68f0cf50f4a2c01b6eb95a8983e0d9d7814d198f32a
+#+busybox-traceroute.2429ce3a0c431dadfc0668d60fb13d4a7fca2d5d16ade42ffecf36ce4f89baa0
+#+busybox-wget.ce90f68067c9539751edd9e2cca3be07bf15075ee1c690d4062a1bf226d342b0
+#+busybox-chpst.af71fed1aff7bf86c69557b774db59b4fe36d7f778ef485410430918b19e6589
+#+busybox-console.397dca7c32183b4b0aadb656e390e9529f79f8d40b50a956d843e889279edc28
+#+busybox-getty.a336c850d60eb7c5c7ec1db78052c3580a5a4044a04c32b744ea5107a2c1ce58
+#+busybox-i2c-tools.0fd529f075289fdbaa0bc73d49a1bef6af00e83fbb7117c16b8db087531ac0f8
+#+busybox-linux-extra.24d1b6d1976c35b6fd60dcbad716cadd30c6c1809ea38356b44646bbcd41ac57
+#+busybox-mtd-utils.d71bc206f11ac28fc084056ad5b582b7644d62689fa8e1af63812a322411af3e
+#+busybox-shadow.5e755181d3b2dfda29acbef0db527c6978db81962eb1cb0a330946aab63e0280
+#+busybox-su.3cdd99ba3237190df1dc8044384db002690ef70583173ee6fbc12d4a63891289
+#+busybox-util-linux-priv.f16ab2e2d7ebbc437fc8281906d240a776777ccd29a8fc1156fdd5d53aa4ba53
+#+busybox-logging.7fe744403efd37f85e6c2caf9b104a61d2d38d69c19bf1e099347468266747aa
+#+busybox-cron.2fce66542d321d6d2c9c9a6f2059b973cfc3d5ef5c06f9157ded14f79537ce59
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+s6-rc.fbb5af4ba6864263566fbfb101b7d822e8c77c7829c2455ef70fc17714727cb7
+#+s6-portable-utils.328d4e19549e0d61e320a5d082ee41208da820089457814de7bd35c6b6f8d99f
+#+s6-linux-init.9c14c94e915f263dc1c45378f2b4726a52abfa2ff4697d00167946bdb79c920e
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+system-config-rc.d76dbd2dcba9c4f7303855a84effed8e4b4852d4402d15e3d375911736e00eea
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.10c55a4dc106b0041f8a796f999f230a08607da8e90278790c49272acc3ded4a/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.d76dbd2dcba9c4f7303855a84effed8e4b4852d4402d15e3d375911736e00eea/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//home/ccx/versions"
@@ -193,20 +193,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+s6-rc.8a12474e2ad067516a8e6fd45a8850f134a67680b8e4348c5781cf6e29e4c249
-#+fileset.5f7665e33232f7be0b4d12bdf6e4be6b9e23402e11a1c5c1dbec16173b343533
-#+system-config.c8ae49cd728a0e1d093089db367ce4cbdca818375dd8412bcb8a2c9cbe957fba
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+s6-rc.fbb5af4ba6864263566fbfb101b7d822e8c77c7829c2455ef70fc17714727cb7
+#+fileset.2f03e2b9228c4de18829c4525c6752fe03888aaadba59a968004abad48a0810b
+#+system-config.5b666a061ace662f25a5d6aaf83c5af39e5b76b34a95aee4e78ae978736d2624
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.c8ae49cd728a0e1d093089db367ce4cbdca818375dd8412bcb8a2c9cbe957fba/config/s6-rc-source
+src=/home/ccx/versions/system-config.5b666a061ace662f25a5d6aaf83c5af39e5b76b34a95aee4e78ae978736d2624/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
@@ -85,22 +85,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
@@ -64,20 +64,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
@@ -102,20 +102,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -1,90 +1,90 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-dosfstools.85265e825ae5e83cb7ef1f8e8c37509b8de118a1ab5d63035b14bccd8655266e
-#+busybox-e2fsprogs.2248b9ee6634404aea167b90741007bf4a8e52de081def33cb41bfa3f63958d1
-#+busybox-iproute2.a2c7f4d57fdfeea95298b0e2be848b9512f3df3442922de5db5053bc5c9bffd9
-#+busybox-iputils.784abb3101c331fbe4418d365b8ec6fc49a2bbd2cc5c29d1f0f66c15f1e4947a
-#+busybox-net-misc.ebc1d13bfb08e44175582391bc984df4c81608fa66d615d59e2b108916a64d19
-#+busybox-net-tools.337778bb47c51371173ce977d7b5e3a378b74fd09fc6a52da56cd092ecae8453
-#+busybox-traceroute.4dab80dd286d621ed36681ebccee1a3ac1d005197dc01c707f11b8bce0f85c31
-#+busybox-wget.2410b3d8c37c4265f4e042352876502e96c666417f06b8496f2a53709cc883c7
-#+busybox-chpst.93e91c224002624056af2e2d4bdf7a0f394f2fc6fa0d5ee38a4c21b944814921
-#+busybox-console.0c8afa6c2060ce6d5827715aa54cd1f083fb509484142fad80d2f962cf49cb55
-#+busybox-getty.8767092bb4cba017e07d358949575fa77f8c5ea7394102d67a6268e867f1962d
-#+busybox-i2c-tools.0eb043f1ba88f3d459f00698f86f8f8ffd80ae8c2fc0d7d22fe5d5bd07932261
-#+busybox-linux-extra.59751c34e54d157f91ae1b1c408b78cd900b1a04cec9cec31bcb8850e3816231
-#+busybox-mtd-utils.cde3695812ff988954694ba606d8a4455c6e96a81b775b732d1a3ed097d87f3a
-#+busybox-shadow.2bac52bc1122d66e84a9cd22a3a627eaa963013524f99bb85421918aed0cd026
-#+busybox-su.021a194c14730d11718269e924bdb40be96368f5a2a783cbf024691619af0aaf
-#+busybox-util-linux-priv.0963da9601439f24ce716a1a4a1dc771d9b2df8358be065326f531456fac848c
-#+busybox-logging.ce834cd221dfcc14ec2d50035dc958fcd82c38484eec994888258738454c372b
-#+busybox-cron.0942ef686004d2a839d1d7351b6f81101c924098955d0be3db6cd3af657c700c
-#+attr.285118da456b4e3be682bab584b9a8fa8240094bc691604a77ae209aac3a40c9
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+diffutils.54f2d772bd560d3366e9b2c6056b6b4c8963b144904b142565cec869f1406e32
-#+patch.ccb91685fadbdf09327af5c53712a215a9face92e1e2f581c9e9f310f4c6b86e
-#+flex.d99904918d6a8605243d4e8c75e4c6866f8efa442c30e48fc8534a001abec6e9
-#+bison.7269fec828b34f75951079495c1bee4536d31586ca10fccf4450720c6cf4cba6
-#+rsync.f72eca8c09ddccfaa9d9bad23b0c75527f5bbdc03cbb9b2ef142f74f1418d270
-#+execline.0e828bc301881bc7aad5c5ddc2ebbde9fcd4a7cd783f71d35c1dee507dbb0c6e
-#+s6.7ee9a5a6a4c180cfad8397fcfc0975d4ada3700b2c63c152cedf52b0a3ecbea3
-#+s6-rc.8a12474e2ad067516a8e6fd45a8850f134a67680b8e4348c5781cf6e29e4c249
-#+s6-portable-utils.3b835184b86cc4c003716d4116f583142f789b215afc24c9c3070f6b55280b7d
-#+s6-linux-utils.fe7aec6f035444375d4354c8d94d828d27014e879a4309129a1a07201ead60b0
-#+s6-linux-init.654fd4a6fafc787dcd8aba606ea96a88c204e44f47ce98e11f7db6cd945757b6
-#+mdevd.2ad5582d1a920ad8114f4110ed6244bd0033ff862ef92b3f477d24e33d1965be
-#+s6-dns.401ef3a77db8adaeb99591606c8f6e8540058147af984c975bb1d81d5cb79d16
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
-#+s6-networking.e3faf7506c0e71f584d96695af560f63ef7003f2cd44d2a25353b03773c8cd3e
-#+zsh.5d5d3e6d4c41411cbcb19aa9e10ebe1d7455d410c8434b66b174344b8d286ac4
-#+pthbs-banginstall.d2d7305f9a05d3829a96a67a63e57902205703add37ef76cca62ba9d6c9910f0
-#+aat.b98e04d9aa274220ed7300725ed3549ecbbefd647bb173214f3c3aea431d505a
-#+confz.3ce5fc67eb7c3db90a88c734f99b147fe7230e293d4411f3ab27d967d2f9d8dd
-#+containers.c2e10e8452b778cf9ed4513c3e62044b220c9c2eb8ad4299b126f0aa0e8c5367
-#+fileset.5f7665e33232f7be0b4d12bdf6e4be6b9e23402e11a1c5c1dbec16173b343533
-#+logincaps.a711ec9f87cc294cb22d71006aeac7c2aedf6a1563d734ac088cfb6e17cdf4b1
-#+snaprep.c927d0149ba6a32cb8080dde702ef7e1da16c46fb16bc50553a95d893bb6672a
-#+curl.ce3347b501eb872cb16c7aa0353f4b9af848a13363915ea8f4176f4a2436fe31
-#+git.47dab6270a4644cfaa3e839c0d2d360be942b3f8745232aeaf62c8af41167636
-#+xbps.44453532397d0f2a57a0198b0dc68b7c239bf5a8ac16a80f12a94140396a7be9
-#+apk-tools.11b59b0e8d4834809ad6545d19ac3476f2d4423c4973fce357923fc1d469ca40
-#+getent.5d02dd9936859c0934ac274ca67387f92ecdd1b8dd624780d1e66b8a0f1f6342
-#+getconf.e3e283909e0a75a7691fde52f2a106783bfc99d9681720504377f8941075b6f8
-#+iconv.03f207b11724b6a9bb95e7677ec30770b2a30a21c09a2c09e79e30e0a10c7543
-#+libcap.0d360516e5086192b93754e08efffd72f6504af56d8a514a460fa42589cbf1a0
-#+applyuidgid-caps.336a5f45a3827cb86627163f318e360c670c7f57503878429e2870c0e7b81ae4
-#+ccx-utils.41274c253c01733750843bcd46eb5249e9397567936f222486ee5ba7518e87e1
-#+user-env.44f719ee5f6b348d0716b59adb3a89177f02dabeacb7637c6fef61565fd016e9
-#+strace.1dab6a0c2ed12be76527361a57b6ff6ea106fb5f17fed8798011d9182f06f5b8
-#+mlog.235369627809906a4e7547f28f9f71a5501901d63e418e2ec16cbd56c98c444b
-#+findutils.9fd553f92b4bd2e599b436a04e922d94f84e76db439e0b4051e75e7017bee41c
-#+nawk.bfe0243a7ebdf63d323a1637adc54fab91cc1e85388c76ddb120023061127c66
-#+squashfs-tools.f37311d0f4e9165b72d1a677ff480ce911fb5e75ee4c5e21178cb5d5d2a84a4d
-#+mandoc.fcc7b1db23a3d62d70a612ae7eaa28fd3746318050e01948a60302699368bac3
-#+tinyssh.e5dade58f968cf39d110ee1682294e68326f94679ccccc3c4a8344ffbdb4469a-
\ No newline at end of file
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-dosfstools.53e30486c6e40b854611e47e94c0dfa06c41691311cbbbaa290331b3d28cfb05
+#+busybox-e2fsprogs.a9db189743f4ef5ee540c2adc08214fe94a6ff732c50e02ae4c623706c246f7c
+#+busybox-iproute2.d538589972980a1e3a52e4830949ced1c22e0050b1ff57762b2972063ad91648
+#+busybox-iputils.8cbd732f5342bf8da8c1456cffb23554dbafa6fb19f8c6a19f1b67aaa243a662
+#+busybox-net-misc.eb9c09a2d8c9518a4cd038571adf312cfdc3e57eeed4e74db8e78c347ec68853
+#+busybox-net-tools.c82b35e4e8c518b44444f68f0cf50f4a2c01b6eb95a8983e0d9d7814d198f32a
+#+busybox-traceroute.2429ce3a0c431dadfc0668d60fb13d4a7fca2d5d16ade42ffecf36ce4f89baa0
+#+busybox-wget.ce90f68067c9539751edd9e2cca3be07bf15075ee1c690d4062a1bf226d342b0
+#+busybox-chpst.af71fed1aff7bf86c69557b774db59b4fe36d7f778ef485410430918b19e6589
+#+busybox-console.397dca7c32183b4b0aadb656e390e9529f79f8d40b50a956d843e889279edc28
+#+busybox-getty.a336c850d60eb7c5c7ec1db78052c3580a5a4044a04c32b744ea5107a2c1ce58
+#+busybox-i2c-tools.0fd529f075289fdbaa0bc73d49a1bef6af00e83fbb7117c16b8db087531ac0f8
+#+busybox-linux-extra.24d1b6d1976c35b6fd60dcbad716cadd30c6c1809ea38356b44646bbcd41ac57
+#+busybox-mtd-utils.d71bc206f11ac28fc084056ad5b582b7644d62689fa8e1af63812a322411af3e
+#+busybox-shadow.5e755181d3b2dfda29acbef0db527c6978db81962eb1cb0a330946aab63e0280
+#+busybox-su.3cdd99ba3237190df1dc8044384db002690ef70583173ee6fbc12d4a63891289
+#+busybox-util-linux-priv.f16ab2e2d7ebbc437fc8281906d240a776777ccd29a8fc1156fdd5d53aa4ba53
+#+busybox-logging.7fe744403efd37f85e6c2caf9b104a61d2d38d69c19bf1e099347468266747aa
+#+busybox-cron.2fce66542d321d6d2c9c9a6f2059b973cfc3d5ef5c06f9157ded14f79537ce59
+#+attr.e17aa90136701b1bd9e3586c39e3148cee87dd404a0e28d4c65cd4c345d5f867
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+diffutils.3ed82a2f49b3a332812cdaf5ce42937b7eaa7e7289ec7665a054c1990ae927af
+#+patch.baac6f4d46ac62239921f90acc2da845839f79aef3cfa3ae8414c19d86e5d70a
+#+flex.60e63266e21b63f26734c8d4776c87bbefc6b16938160c5c4b8302845d9d1134
+#+bison.6a4f2ce1cd5a32bcf0c34b1945baecfe20cba5b79f3c4a541c53e7e7c71d945c
+#+rsync.1b12bbbac109a1488d1c1baabd06ea32c13d04c356ee699d60c09158968bcee0
+#+execline.c1b685e00b034b2cc1067814e015ee94d0069d558edb4af30d1088dadbb46f7e
+#+s6.f04d9c8d50806c8c47e7a3bbfa877bbbc609421eb82a006b1ef9f17f126b4d87
+#+s6-rc.fbb5af4ba6864263566fbfb101b7d822e8c77c7829c2455ef70fc17714727cb7
+#+s6-portable-utils.328d4e19549e0d61e320a5d082ee41208da820089457814de7bd35c6b6f8d99f
+#+s6-linux-utils.8527b26bae8aac43389702dcb32cee27f8fc01c1fe56ba729d2db8c3e9fcfa43
+#+s6-linux-init.9c14c94e915f263dc1c45378f2b4726a52abfa2ff4697d00167946bdb79c920e
+#+mdevd.3f0193774ce74e9cd78dadef55458588253a4679ec62c19efd656fba4d6146a8
+#+s6-dns.10f9dcad99bda42732f1e44bef4d1dddc940dcc329f4befbbd1fe91833da452a
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
+#+s6-networking.16fba46f37077dc7c66086e984e8c2718e62621fe14397603da6c3721ce3901f
+#+zsh.3fcac08852a51719a63fcb37a92385f9084d62df7eaa80415566127d4ee10935
+#+pthbs-banginstall.cdc87dcde67a1d34f9ff11ec5e1d55b3f468c4b30e0b0360d8e7b1b25448a150
+#+aat.01ac2532c116f85781ef3a544e82af471e03d7b9e5ab28196621bb9016fdbf05
+#+confz.638980c06bc1ab1c3a46c2dac87c4861404eb3a8936249430b28c77c8dc20130
+#+containers.3a73540556541ea75056b397c7b64be22dd87ae4ac0572e8360f1c5637a8901e
+#+fileset.2f03e2b9228c4de18829c4525c6752fe03888aaadba59a968004abad48a0810b
+#+logincaps.3e7f60ebb9a3830a643aa53683d858ab71ec25a8a91fc1ae9fa61257cb04369c
+#+snaprep.a43ec5e845611fe4e863956912c15f619e8e6f94e4815b37cb5473df5f5fabfb
+#+curl.33024ffb51a19b9b2209f22841b882041bf4b90dfc2cef22ce1f2f42d803730b
+#+git.171b024a1876bbdc321fe0cc9d45847cfbff43e6ac9a28e1548d90971ef5577b
+#+xbps.b14047f6b8e7ff5e4232a4e933dbaaa756ae5e5566b24a0ef227a464658a259d
+#+apk-tools.90720114fc824735c187ae6dfc800818e536d969fc83977cf3daa8e621890be4
+#+getent.d79f920cfbee726e830016b467c8bb87433f9a8a0ebaece3a1dc36d631e24209
+#+getconf.d90d9bef6e2866b0b9affcc7827de5996c3c9784dda1b44c416b4775242a7791
+#+iconv.bd80da5eeb70530bce5f0afa7963671d6a4d7f8803b1b8796d8934f0d07fd08c
+#+libcap.5cf43453236e91c96b9e5bd13cac766b502bc44ee5353add5935447da6705a7e
+#+applyuidgid-caps.e20a9573b922544197abbe5154be42d910438916fb3a143403e5dd1eef6d10d7
+#+ccx-utils.ef6e27392b3e3e9f98095dfcefff7cc22a4534be8e9bae6178b4f9d77017c0b0
+#+user-env.8f131ab0a227a4f0f0d27ee88faaab5a11196dd8679a312911e7943354a03dd5
+#+strace.606db7858b7800444c533852447076903afd199ed853aac0c0a6bd61f02ef059
+#+mlog.82418175ab4f7096bdd077178a4d1ee493bdf66a43e03e226a4716d326b45b04
+#+findutils.bedc671aaff0ca89c64416ce7b6779960420cc8c690b2fdd9e3e028c67af2bd3
+#+nawk.acc3a4d7c7aa6394c03ee568557f4fbb27457f6a00769946c004f0587b023108
+#+squashfs-tools.c38bd905544ce454c66c26f3956716018e1471dc45a8271469f6d8d37d88d75a
+#+mandoc.5b34bc9da6be1b45a29acb7b988202f8f0a56d0562f49520fbad6b9d57a2693f
+#+tinyssh.cab0752a63fc0309b8e01fdb43c165f70440ecde3f4a46e261a3f4cea9d28100+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.da0a328fdc3f60c8dbafd5c96804471afaff3df3022a1b1a8c6836f83b252463-
\ No newline at end of file
+#+linux-qemu-guest.e42986d0e927dec74d1dd581ed1de755c2b78a4af57cee45e58a88e796249d4a+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+libarchive.9bcff68db3ce1689d17ff6587903d941feda71336599d2fa3f05e14953a98894
-#+libressl.7dfedb438d2d75eba0584a8b4202a54156035cf1a1e12e05c944e27c27e4777c
-#+pkgconf-pkg-config.a4abc7e539011e377d637bd41423bf7f1d68e50735c69c42cc11144aa694d188
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+libarchive.7e5aed822d7d1813a11b98df739d606522f69e4c1f4041696a88d193214487fc
+#+libressl.a6a82ca5e9bf99b15fff34ec5a8bb666b92592d729439e3ab5b8ae662b349217
+#+pkgconf-pkg-config.cac9c462057ee1ddc2e06a84629e23bfefda47f2fc0b45b5ac9d951b62f5dd03
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
@@ -127,20 +127,29 @@ $1!="."{exit 1}
 
 $2 == "keys" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+m4.fa4932044f2aa54637c4765e79c1a59417cf2f76dced18c7651db35f21f8cbb0
-#+netbsd-curses.6bf0eaccda32bdf1660f137c0a6a8f656dd5cf86f073501ef701ecc5cdbdd903
-#+libbsd.749360ae5ad95f97da532ec6e544a05c5dbb2e7c5c7891d8a030775c0751d150
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+m4.73caec60182ac812daf2a33e9a73d2d0f74a77e3f423c4a8f85f8d481d728329
+#+netbsd-curses.1c82038b7c0c9b2d60fbdce942dcc5e045aa68fa243df2d6c47cdec91beeadfd
+#+libbsd.6879b165050f59d099c08eb4739a388e2503787a302e68239afbd8d8026af7cd
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -163,20 +163,29 @@ $1!="."{exit 1}
 $2 == "zsh" { link($0); next }
 $2 == ".env-template" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.96b0bd8c6c00a7a802d35840d7b8d64985854a1ef8482522f790a418636f3ae2
-#+busybox-bzip2.103ce833946e6e1a539935c052727f998b87cd8600f1757c8c3ae7b33bcfb9e1
-#+busybox-gzip.4ea52d0a5dcd7f769eefdbe41447269b8496fca8f747afc01c2c5f9263d962c7
-#+busybox-lzop.ccf2dda3e0a4c98283e6b4b25a4fb9495c145d1e85fad48c59163b61c6c8dc1e
-#+busybox-unzip.8f58ef103881dd8f9f49d4059807e0c5abb953875fc842ee47b702b12409f709
-#+busybox-xz.998aa281b9e938706a0017383fdecd2c9bc3b769255102c59cdcc2786ee9e5bd
-#+busybox-cpio.d8849a65a78340d45fad8a963322ba14cecc28ea32823b8d9fd5f93c1dc2e450
-#+busybox-dpkg.01f616870ea80972b7333390e397eef5f4bb3f4e057b5c7fafa1e68b615ea1d5
-#+busybox-rpm.719a41fc78ba00538736c2003a1749f5eefa306372454818e75debb81aa8f80a
-#+busybox-tar.6d35127370bda4754a50def30aeb526f9141697951c2ba308f6982e1e202b201
-#+busybox-ed.407853311f53b64092051fd4839bd5f57b787b3c5db200b30b0a164f6ce64ea4
-#+busybox-sed.93a8f2982915623746c0555be7438f772406bb038d2590ffb0feba10a7e94445
-#+busybox-vi.e4b055ae26d7e4f648024583d28f43c1c65f55151c71dc42fabffe03989eda02
-#+busybox-xxd.b1a1c9d656c185bc25ae8a0e0f342e61c474b2e70a147ccedad07be02954dcab
-#+busybox-process-extra.30e3b94ad18e0530b46879d83d54a49055e9c09cc8351094f2a1c86ca1ba3b9c
-#+busybox-procps.06c566b83c46a664539cf11effee5ffaec4baed3204ac6a14f19fc5a4df3a0d1
-#+busybox-psmisc.a0b8629c56cdf44b8efffb77bfa5f449d780e80624989c8131e58f2aa66e275a
-#+busybox-ash.7f76eb5c7bc4da0ff3a819bc7439a8ac6b3133ed5128c756b801031269f358d1
-#+busybox-bc.bab3cdd3ac64291efc758c52fc1dc898d398bb2f0b07aa418114b751751e6c52
-#+busybox-coreutils.e5cf5e1bb6dcc2606270ca3a3a9717c64e1f61ab60006aa6a5c127037c3afa45
-#+busybox-coreutils-extra.6c7f6c53a9a94d864d56e5b1872184a2bfed6af274451c68c4724fc8ac5a0711
-#+busybox-daemontools.7948d10b2780fad5838a3c483660c3ac260369ee601f8939a82edae2270213d9
-#+busybox-grep.1341e16f3413af4e0695b8ac0f513c906db31f5442a1b15b0c9be7b9c9cfd87e
-#+busybox-misc.fb024d61e906e8d8e3a64a250fb1998b7f0c21350617c77c8959cf02945cde81
-#+busybox-sh.78edf462440ba97967d9e38801ab45f574ca736385374ba667fef909dda2f77b
-#+busybox-util-linux-unpriv.58585107e97d7f7947a65d1d441b97519976df2ff2a1800f2675956d08cd7b47
-#+busybox-findutils.a33db5e5a916e1a718f614bcdf8c6090b15c410194d5358e350725edc598c8c7
-#+busybox-awk.0bdf78ee1e65fbff2317b369f0369f867dd10869d0aef7a106bc6812bd5ccb5f
-#+musl-cross-make.0914b14c586c92e9e8bd8c2f0def7396f11d8167bdfa1fcb5def9823f6157d6c
-#+gnu-make.fdd404a3e704b48b1302e2e55f9ce39c09abef2cc80eb8f0c9d3e5e77fdb2cb8
-#+busybox-diffutils.3a9ac9be401d7a218225911ed298efb12e3968c10a3d3a3fc45b75c619f6860d
+#+busybox.b047efacfeae0104dfe94213116bed72eb9da698ba760e9021e194ea35f25177
+#+busybox-bzip2.69952ec154258cbd2df50a75f2325dba294852657c47a1b9b8b808924f374bcf
+#+busybox-gzip.21c06fb5d14510bf0872c8ed5a5de5b22ce0a223bddaf82060a613fc96618edb
+#+busybox-lzop.533da388196043fc6e9d89331457fd9f5201fca35040417a4ac76f78142e6aed
+#+busybox-unzip.0db8febdfa1cb8c85cbef00a1a3c96861af716418ca66f983c457ffb8f9fef85
+#+busybox-xz.11c6076a51a3abb54d40e8e047e129f7b38976d91f5d6b49ba9e48e6e9cea5ee
+#+busybox-cpio.5400313ea7a425a83ee6da0f003d58594f38aee15bdeb0b67db75cb4276eb405
+#+busybox-dpkg.864a44b1e76802ef9f3b9f4fee182259e840981d14c825c1589e4573fa8bc98f
+#+busybox-rpm.790aa1174928e6378cbe9750510301eaa9dc3292918128b09fcef26b69cbc4a2
+#+busybox-tar.c3d611f2678545bc9418fd02ae2c36b8febb941bf01add0e1a7fc83d10d1e92f
+#+busybox-ed.35bc120e3fe81fb7ae433353b5ae3fe7ada2b2e37e221606c0e2a501e45614f8
+#+busybox-sed.897fc348b1a26cf1e8b700db5d495caaa6808c49b9032162fe847d44bc65e0e0
+#+busybox-vi.a1d2c94aa8ac02aed05aee2397d95cd51cac05c25ae864850cc073528107b7d2
+#+busybox-xxd.7f26411069acc1fadd719ba26b0047c7eafc689903dd45fef7e0064b2d192d41
+#+busybox-process-extra.a0613f4be101e7fa2883862ef437e833e17d596cb6086fee9fafeca0a3493057
+#+busybox-procps.1ad6ce78a82e23760ed91cd2ff5b4bb04a0b71a71e84add382526004cb4c9e53
+#+busybox-psmisc.0ad7d90028e1ea04d061a20083e43ea44e3d5bf93dbb90fdae83fbcf610681ca
+#+busybox-ash.138a265f4ba30fc89da2bbb7cdff71796f88ba18fceaa12489fcd0384e2b45a3
+#+busybox-bc.21d6273fef5c1ebfdf3d4f8b3b047fb29aac0e647d80de47b1d620fd20e198d1
+#+busybox-coreutils.c92e940232b35cc9476b1dd287b7763833dff8e8dd44aa578953a3f9b42c5b94
+#+busybox-coreutils-extra.4e7601be13aa8c0bdd57fce38d6ca5822778ef88c9878a4467b342f9b3f68e1c
+#+busybox-daemontools.00a69cc75465b92b88639bb17cbd4de99c31690dc21e900b15ae33c1eec3e4d1
+#+busybox-grep.6ac0683ac9baafece4f3ae6ca65b331abb7c0c09677f8e02b8ced505be8d85fc
+#+busybox-misc.81eac71e940eafa448eefd1184d0a9b49a74006c827df7ae3a4359792a8f8139
+#+busybox-sh.11801ee513bc5b6bd1802436541032c99fc2c58f5892306cbd24cfd10ce1bbe0
+#+busybox-util-linux-unpriv.1f976326a31e028b962a2e8a46c60ae960d76301a6f469012c27ff43acbcabf6
+#+busybox-findutils.783f25174cb733ecb767de616d472aa7139ac2061edb079b7709e83ab843ccf6
+#+busybox-awk.6d0bdb6f494ab4a478cc36eb8242d30343f7da0f5bacb73deac1d85b156f267a
+#+musl-cross-make.6d15596144dcc98d9b1366733c552725119dce2a5c0496033f210a6a3400faea
+#+gnu-make.b98bc8e378c1de8251e4b645ccda0ab337d2eb668d9024ff42544f307df372b3
+#+busybox-diffutils.f57c6bdffd9275054cf3ae108b710c65d7102dd8e74623605b4368fd2588556d
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
@@ -100,20 +100,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
@@ -87,22 +87,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
@@ -110,20 +110,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/alpine-keys b/variants/root-x86_64/alpine-keys
@@ -1,32 +1,32 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
@@ -68,20 +68,29 @@ $1!="."{exit 1}
 
 $2 == "keys" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+patch.8db933ca138e85d9e089edb6d824497d96ad49821c32c2b79dfe3fb5200fc59e
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
-#+zstd.56043719382a4006fc1850ab4468db81cea2c9f56025c3fb39141dac2a4821f1
-#+pkgconf-pkg-config.27bd89d2a71510509379204444af2af18e3d1f55c16e7b0190fa1f05ee50d029
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+patch.1225eb800ec6e0421d25728b71fb3e19703373425c5c4ed45ed964ac89212025
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
+#+zstd.0e5e52b427b7170936461f538f4b3693f70ba251809929b15223c5dc21cfe35a
+#+pkgconf-pkg-config.0cad8e56f082b98336c9640c2415c9ddc2f2b6e0426b3f64b7210af40ff06855
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -108,20 +108,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
-#+libcap.683f862a53bb1c8c43ddac06a3eb19cee36a6358907a83da8bfaa6cfd57b1ae0
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
+#+libcap.7bbb6a623d348970799e44e4552e5ccff8f43619187ce9d2c527ab2f74619d31
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
@@ -97,20 +97,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
@@ -106,20 +106,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -125,20 +125,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+flex.5aacea292611a322b9d0faa2d50c8a8e5af41b0e70ae5f0c9ec72bb5c80f59cc
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+flex.a0ca1afbde90c6494bcc4dc039ac1892034358d4fc6c590de40df83f32966126
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -127,20 +127,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/bootstrap.environment b/variants/root-x86_64/bootstrap.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f-
\ No newline at end of file
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114+
\ No newline at end of file
diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
diff --git a/variants/root-x86_64/busybox-ash b/variants/root-x86_64/busybox-ash
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-attr b/variants/root-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-awk b/variants/root-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bc b/variants/root-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bzip2 b/variants/root-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-chpst b/variants/root-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-console b/variants/root-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils b/variants/root-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils-extra b/variants/root-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cpio b/variants/root-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cron b/variants/root-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-daemontools b/variants/root-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dosfstools b/variants/root-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dpkg b/variants/root-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-e2fsprogs b/variants/root-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-ed b/variants/root-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-getty b/variants/root-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-grep b/variants/root-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-gzip b/variants/root-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-i2c-tools b/variants/root-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iproute2 b/variants/root-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iputils b/variants/root-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-linux-extra b/variants/root-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-logging b/variants/root-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-lzop b/variants/root-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-misc b/variants/root-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-modutils b/variants/root-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-mtd-utils b/variants/root-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-misc b/variants/root-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-tools b/variants/root-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-process-extra b/variants/root-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-procps b/variants/root-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-psmisc b/variants/root-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-rpm b/variants/root-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sed b/variants/root-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sh b/variants/root-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-shadow b/variants/root-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-su b/variants/root-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-tar b/variants/root-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-traceroute b/variants/root-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-unzip b/variants/root-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-priv b/variants/root-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-unpriv b/variants/root-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-vi b/variants/root-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-wget b/variants/root-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xxd b/variants/root-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xz b/variants/root-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox:bootstrap b/variants/root-x86_64/busybox:bootstrap
@@ -1,14 +1,14 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/versions/musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-make=/versions/gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
+mcm=/versions/musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+make=/versions/gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CFLAGS="-D_GNU_SOURCE"
diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+certdata2pem.9e1244cbf687f681d3683e53694f0a98f7ea01e1573e744f87743a4621071086
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+certdata2pem.7b07b7aa895df4f8cc89569024984d49fae716622dad9ed52d37969680b7cad2
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
@@ -78,20 +78,29 @@ $1!="."{exit 1}
 # TODO! need better matching, will break if you move ssldir out of configdir!
 $2 == "config" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
@@ -127,20 +127,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
@@ -95,20 +95,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
@@ -84,22 +84,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -1,60 +1,60 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-dosfstools.cede36089a529747add4b87d7d9fdf416216fde7c4907967f0f810072385320e
-#+busybox-e2fsprogs.0e2aa054a89ba26a1e3aea9c7cc829d0e7cda3994a2f46043d276de8bafb7094
-#+busybox-iproute2.3225ae64400729d39edaed1fb0e3d47df1e4f877b843d44f2cb92da0462e913f
-#+busybox-iputils.7447253684f7fefabcbcc87d00ce64eae8e9fbbe5f274d4e05c963ab3db8800e
-#+busybox-net-misc.446a9542cfacca71f2de0fd70b5325879ecdfe599da477adfc57aeb5f6333409
-#+busybox-net-tools.f7f7dcd270ec9abd0f79cf264194a72b14c836d04959bb5cde08ab55057ff9cb
-#+busybox-traceroute.5ca2c7b82bfb4d62f02366e36f1ccb44c68db5061844d6049a09751863d87c1e
-#+busybox-wget.1176a69ae2818c253636f82fdf95e50c593f2383834d6a0a57d4d43879a81c6b
-#+busybox-chpst.39cccdb7708209a1569b7a8db33815af5f1d61efa10252faa0b8264e7939a959
-#+busybox-console.d3b8e864dcf390b31ec11751b6df7a5f173f06bd56d983a2779f878a761a1d60
-#+busybox-getty.02d7031c17c6c72490c8e5a9438731bedf46da6cbd670a1d1c804d2ff9715105
-#+busybox-i2c-tools.a379808754de77a17c73b7509c1b1f77844cc55edc3b256a7a2af2961dff751c
-#+busybox-linux-extra.00a015bd2141b6a53c24e23d05d45da8030a99e117fe957364105901cfa7d844
-#+busybox-mtd-utils.61b8e61bac018a2391197c7ab3acf33a1b0a2d642da92eb4f2d6514953037112
-#+busybox-shadow.8c4e08bcb69931da212ba9764c71c45aeeda5d7bb297e891bc20334e3166461d
-#+busybox-su.71aa0610a3a03ef6976577585f006d3448be1e95292a39a505061e683f650344
-#+busybox-util-linux-priv.9f0b01873475e821b9c19d205d628748e0864371a8942de9ff4ed7ea43c40d1d
-#+busybox-logging.c12a39a65484f62e9500905193b3f16f1f545864d98949ed8f728bef95f93bf3
-#+busybox-cron.14f2aad53b4bc0d04e5b7e68bdd32df6edad9292c4923c1511853f688a25483d
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-login.c94f8bc91bab87997a628ed46e1ba4385a3e1ebc737f75c111f30a40ed453c14
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+ccx-utils.6e5508cb77192421cebdf59415d0d277d6d39e38e5fae832100f7c3642d2c274
-#+applyuidgid-caps.ae1bdf662aca9ac8aa82c3b74d1fb96260581070b4688f8a0702b1f85ef7f1d2
-#+easyseccomp.2d3862c62cf6fd765bc0bbd9ac0ddc63fdab8a8f84aaba64798b8fb8dd369be3
-#+mlog.f93b41a0144c38ee34e54f6b6659a1df8c2b208dfd575d8fc472fd9f52fe425f
-#+abduco.88ffdc5c4057fa99087f6848eaba3c4e7f549b3ada10dcdcfb22bb15ff69149d
-#+nawk.6e41b318f0a7ca9942ed0565b4dd1267a29a13a400b493b4bbf5e26d76a04ebf
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-dosfstools.fe9dc7453fb1a770b675108e457029a2739c6ca79627db7538ab89592669f157
+#+busybox-e2fsprogs.7259fca6189c8d0ce3f4da6dcb699a78e25fcfed78c245279c0b770dd7307700
+#+busybox-iproute2.804fa48fd6895383b3a6a27c9098e94e1a436679fc570d4a30643c52f032b3d5
+#+busybox-iputils.7e3069a6f610a281caa381c3fd7fdc205c9a333318478953385201a685bad51d
+#+busybox-net-misc.eff784f9de60c2e42d872c2ab63b7296a42dd61b824373f3b649aaeec5c3b214
+#+busybox-net-tools.fb0385bee303901604824fc18dee7e76c4582b61a9b29454cafcca0a3fd5a96c
+#+busybox-traceroute.f5e6c280aed3c3a34be0fd56898b5e9f31123c3e03a5e017c4ad009b521ed555
+#+busybox-wget.ffbfbf22ccd2b9d8d7d3d9bd5f3f6c4c9141086e580dc44faa93070370062f3d
+#+busybox-chpst.a6422550ba62ad83f199cd94bfaa1be7226cb93c9b5a6492948fd239c42e0062
+#+busybox-console.0aafd33cc9f9715ac3b15ddbac444ef9bf53e0fe74799a6c8bbfb69ccd88d3f8
+#+busybox-getty.ebe9b9d5a1f380298264d6851b0eb4c590eb4cd1fda091e78ad5f584439ec1ce
+#+busybox-i2c-tools.2f367203fde2652cb02921830bdc8884e6011f13604d87d41cda5f1044000fc7
+#+busybox-linux-extra.7bdd28daad9eb0b6e9e9fac88e9ab8c938d448e9866c9ddf6044018cedf5f401
+#+busybox-mtd-utils.c7c720c931e698ab9d591e3eea62dd911cb8f6d08fa8e30f736c3e2d9903b7e9
+#+busybox-shadow.e512b567a6c2894806767c440ae099257279aa7870d73f12038a337e63855ba5
+#+busybox-su.7781cb27b148a31fab99ab39032033c61064f1e60222a69f548a881b6a36b702
+#+busybox-util-linux-priv.d80b7538136e963ecc037e86bc4c12eb40278729b53b76fe063372361f6332ae
+#+busybox-logging.ca69ac5c243d70ede4d47c19d6207d58dbfd870d7426c773db1e2c56500a7cbe
+#+busybox-cron.93a1a158bff3b28f54c1b4178086fa55439d871677b32296404a4646fc8be2f3
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-login.194ad454c23e470229e753dae51e74229e5d9893f7891e048dc50bb71acddb31
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+ccx-utils.b26547dc8a2b883ec4c46581151c3173c1b5e43d55b79081366754db05f6d777
+#+applyuidgid-caps.bdd29d106820b66373e56e8c94e16755aacbae3475d21f4911deaa38b04795fc
+#+easyseccomp.695d55c49feeb4a73cc4680f7b11871dec104c9fb2e31f8c95436ad3809d3bc5
+#+mlog.76ed22dee95284d8874841b434c8b8ee5aff5d55cbcba56d3224c416bb7af3b3
+#+abduco.96e00403db4c41424d077189d29d0f11b00d7b21a060967e6dba0a1d066fae9a
+#+nawk.3a4d5fc4f5da910980b1f73ac9105d3581359e75829f79ed52975a8e3eff81bb
 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
 
 img="$pthbs_destdir/versions/$pthbs_package/container-bin-image"
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+alpine-keys.7abeca05dde6187cf945a70a1203a6f5deb2e62175ab07bdab32e3a5f25e1104
-#+apk-tools.8c27ad371e248cd9a9b0a538f3a184b9c631fa2f2c534e56d91ca4f33c535d72
-#+xbps.f488762f51b6c901c0cef990385cd1fc90fade5a9c183723a4fa0c8a42f88dbd
-#+container-bin-image.4d62abd1f5bcb95d9d884343b8d73078e030da610a83ba6961aff044cd710aaf
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+alpine-keys.abd621a7ede07ba8adaed563401dfd641bd9274145cb51e2fd474a2f2df63c82
+#+apk-tools.a22aea46546549aa4b3da4621ef54c77d2e646765fb6424e44cf884f15513f30
+#+xbps.797b022f57edff25bf117f64ae104092e0e1d2bcff17848b6f66df6513bf9c7a
+#+container-bin-image.d8f9e590321c2faafa119154833acc791ba954e3859d7bcb6de2671439721055
 #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
 
 
@@ -76,10 +76,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
 	"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
 
 mkdir -p "${dest}/deps/command"
-ln -sf '/versions/apk-tools.8c27ad371e248cd9a9b0a538f3a184b9c631fa2f2c534e56d91ca4f33c535d72/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.f488762f51b6c901c0cef990385cd1fc90fade5a9c183723a4fa0c8a42f88dbd/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.a22aea46546549aa4b3da4621ef54c77d2e646765fb6424e44cf884f15513f30/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.797b022f57edff25bf117f64ae104092e0e1d2bcff17848b6f66df6513bf9c7a/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.7abeca05dde6187cf945a70a1203a6f5deb2e62175ab07bdab32e3a5f25e1104'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.abd621a7ede07ba8adaed563401dfd641bd9274145cb51e2fd474a2f2df63c82'/keys/alpine/*/*; do
 	test -f "$f"
 	d=$(basename "${f%/*}")
 	mkdir -p "${dest}/deps/keys/alpine/$d"
@@ -87,13 +87,13 @@ for f in '/versions/alpine-keys.7abeca05dde6187cf945a70a1203a6f5deb2e62175ab07bd
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.f488762f51b6c901c0cef990385cd1fc90fade5a9c183723a4fa0c8a42f88dbd'/keys/void/*; do
+for f in '/versions/xbps.797b022f57edff25bf117f64ae104092e0e1d2bcff17848b6f66df6513bf9c7a'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.4d62abd1f5bcb95d9d884343b8d73078e030da610a83ba6961aff044cd710aaf/container-bin-image'
-test -f '/versions/container-bin-image.4d62abd1f5bcb95d9d884343b8d73078e030da610a83ba6961aff044cd710aaf/container-bin-image/if'
-ln -sf '/versions/container-bin-image.4d62abd1f5bcb95d9d884343b8d73078e030da610a83ba6961aff044cd710aaf/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.d8f9e590321c2faafa119154833acc791ba954e3859d7bcb6de2671439721055/container-bin-image'
+test -f '/versions/container-bin-image.d8f9e590321c2faafa119154833acc791ba954e3859d7bcb6de2671439721055/container-bin-image/if'
+ln -sf '/versions/container-bin-image.d8f9e590321c2faafa119154833acc791ba954e3859d7bcb6de2671439721055/container-bin-image' "${dest}/deps/"
  
 
 
@@ -126,22 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -1,64 +1,64 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-dosfstools.cede36089a529747add4b87d7d9fdf416216fde7c4907967f0f810072385320e
-#+busybox-e2fsprogs.0e2aa054a89ba26a1e3aea9c7cc829d0e7cda3994a2f46043d276de8bafb7094
-#+busybox-iproute2.3225ae64400729d39edaed1fb0e3d47df1e4f877b843d44f2cb92da0462e913f
-#+busybox-iputils.7447253684f7fefabcbcc87d00ce64eae8e9fbbe5f274d4e05c963ab3db8800e
-#+busybox-net-misc.446a9542cfacca71f2de0fd70b5325879ecdfe599da477adfc57aeb5f6333409
-#+busybox-net-tools.f7f7dcd270ec9abd0f79cf264194a72b14c836d04959bb5cde08ab55057ff9cb
-#+busybox-traceroute.5ca2c7b82bfb4d62f02366e36f1ccb44c68db5061844d6049a09751863d87c1e
-#+busybox-wget.1176a69ae2818c253636f82fdf95e50c593f2383834d6a0a57d4d43879a81c6b
-#+busybox-chpst.39cccdb7708209a1569b7a8db33815af5f1d61efa10252faa0b8264e7939a959
-#+busybox-console.d3b8e864dcf390b31ec11751b6df7a5f173f06bd56d983a2779f878a761a1d60
-#+busybox-getty.02d7031c17c6c72490c8e5a9438731bedf46da6cbd670a1d1c804d2ff9715105
-#+busybox-i2c-tools.a379808754de77a17c73b7509c1b1f77844cc55edc3b256a7a2af2961dff751c
-#+busybox-linux-extra.00a015bd2141b6a53c24e23d05d45da8030a99e117fe957364105901cfa7d844
-#+busybox-mtd-utils.61b8e61bac018a2391197c7ab3acf33a1b0a2d642da92eb4f2d6514953037112
-#+busybox-shadow.8c4e08bcb69931da212ba9764c71c45aeeda5d7bb297e891bc20334e3166461d
-#+busybox-su.71aa0610a3a03ef6976577585f006d3448be1e95292a39a505061e683f650344
-#+busybox-util-linux-priv.9f0b01873475e821b9c19d205d628748e0864371a8942de9ff4ed7ea43c40d1d
-#+busybox-logging.c12a39a65484f62e9500905193b3f16f1f545864d98949ed8f728bef95f93bf3
-#+busybox-cron.14f2aad53b4bc0d04e5b7e68bdd32df6edad9292c4923c1511853f688a25483d
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+s6-portable-utils.6953fd0746de15bae9194af3b9a52330124232b740c48778eb913c6be16d8359
-#+s6-linux-utils.0a8c725b752cc3e6424cff528b790390d50e80ac89d3ed4daa66256735648633
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+confz.76aadf1eaa041da7e5a4bf67db25edee947c8390482a6be851a812f3a4f675cb
-#+containers.d61ff0662b2231f7ca2cff52b0722fce4413b338fb33ea45b94f796b223cdb91
-#+xbps.f488762f51b6c901c0cef990385cd1fc90fade5a9c183723a4fa0c8a42f88dbd
-#+zstd.56043719382a4006fc1850ab4468db81cea2c9f56025c3fb39141dac2a4821f1
-#+apk-tools.8c27ad371e248cd9a9b0a538f3a184b9c631fa2f2c534e56d91ca4f33c535d72
-#+alpine-keys.7abeca05dde6187cf945a70a1203a6f5deb2e62175ab07bdab32e3a5f25e1104
-#+getent.999e76717e1c18fbf17c2c31c79853c58ad9c1e021d1f9e02e357f183ee8c5c6
-#+fileset.6b072e59bc4b8a5db97440923584ee26ac5dcfe9933f9ec89b111c5c1bd47d6f
-#+ccx-utils.6e5508cb77192421cebdf59415d0d277d6d39e38e5fae832100f7c3642d2c274
-#+easyseccomp.2d3862c62cf6fd765bc0bbd9ac0ddc63fdab8a8f84aaba64798b8fb8dd369be3
-#+findutils.f2299ef188fec38248caf926579b05887d354deb57caaa8cd20f3d45ad6e06b7
-#+nawk.6e41b318f0a7ca9942ed0565b4dd1267a29a13a400b493b4bbf5e26d76a04ebf-
\ No newline at end of file
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-dosfstools.fe9dc7453fb1a770b675108e457029a2739c6ca79627db7538ab89592669f157
+#+busybox-e2fsprogs.7259fca6189c8d0ce3f4da6dcb699a78e25fcfed78c245279c0b770dd7307700
+#+busybox-iproute2.804fa48fd6895383b3a6a27c9098e94e1a436679fc570d4a30643c52f032b3d5
+#+busybox-iputils.7e3069a6f610a281caa381c3fd7fdc205c9a333318478953385201a685bad51d
+#+busybox-net-misc.eff784f9de60c2e42d872c2ab63b7296a42dd61b824373f3b649aaeec5c3b214
+#+busybox-net-tools.fb0385bee303901604824fc18dee7e76c4582b61a9b29454cafcca0a3fd5a96c
+#+busybox-traceroute.f5e6c280aed3c3a34be0fd56898b5e9f31123c3e03a5e017c4ad009b521ed555
+#+busybox-wget.ffbfbf22ccd2b9d8d7d3d9bd5f3f6c4c9141086e580dc44faa93070370062f3d
+#+busybox-chpst.a6422550ba62ad83f199cd94bfaa1be7226cb93c9b5a6492948fd239c42e0062
+#+busybox-console.0aafd33cc9f9715ac3b15ddbac444ef9bf53e0fe74799a6c8bbfb69ccd88d3f8
+#+busybox-getty.ebe9b9d5a1f380298264d6851b0eb4c590eb4cd1fda091e78ad5f584439ec1ce
+#+busybox-i2c-tools.2f367203fde2652cb02921830bdc8884e6011f13604d87d41cda5f1044000fc7
+#+busybox-linux-extra.7bdd28daad9eb0b6e9e9fac88e9ab8c938d448e9866c9ddf6044018cedf5f401
+#+busybox-mtd-utils.c7c720c931e698ab9d591e3eea62dd911cb8f6d08fa8e30f736c3e2d9903b7e9
+#+busybox-shadow.e512b567a6c2894806767c440ae099257279aa7870d73f12038a337e63855ba5
+#+busybox-su.7781cb27b148a31fab99ab39032033c61064f1e60222a69f548a881b6a36b702
+#+busybox-util-linux-priv.d80b7538136e963ecc037e86bc4c12eb40278729b53b76fe063372361f6332ae
+#+busybox-logging.ca69ac5c243d70ede4d47c19d6207d58dbfd870d7426c773db1e2c56500a7cbe
+#+busybox-cron.93a1a158bff3b28f54c1b4178086fa55439d871677b32296404a4646fc8be2f3
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+s6-portable-utils.0b60152cde5b1e8e8e439ecab2233f582e214f0c846014681b99e6d66a4cc3f5
+#+s6-linux-utils.aa097f82e882ae00ab6eefe8950fa4a3e2dd28c22770205b2f805266b4588772
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+confz.976e2e5eca44f9e2f3aa156dbac5550950205e2074ddd5a2182f51f962de20ab
+#+containers.15e85b61935af2e77d7f958996f6df6455b6a5cd79a31026d0cb91b559aa4920
+#+xbps.797b022f57edff25bf117f64ae104092e0e1d2bcff17848b6f66df6513bf9c7a
+#+zstd.0e5e52b427b7170936461f538f4b3693f70ba251809929b15223c5dc21cfe35a
+#+apk-tools.a22aea46546549aa4b3da4621ef54c77d2e646765fb6424e44cf884f15513f30
+#+alpine-keys.abd621a7ede07ba8adaed563401dfd641bd9274145cb51e2fd474a2f2df63c82
+#+getent.8a0c3b9665c430990fecc07f769f33a2355e796e1e19408fb5d226952d67ac95
+#+fileset.d409c0ed822b5b2c83ce61f351d3046168445548f4c2e8c556fb5203ad578a49
+#+ccx-utils.b26547dc8a2b883ec4c46581151c3173c1b5e43d55b79081366754db05f6d777
+#+easyseccomp.695d55c49feeb4a73cc4680f7b11871dec104c9fb2e31f8c95436ad3809d3bc5
+#+findutils.6098c312e4bc7e3b5737a2aef7eb3e5b3cdd729df8f2521b16d2119b79546cec
+#+nawk.3a4d5fc4f5da910980b1f73ac9105d3581359e75829f79ed52975a8e3eff81bb+
\ No newline at end of file
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -146,20 +146,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,96 +1,96 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-dosfstools.cede36089a529747add4b87d7d9fdf416216fde7c4907967f0f810072385320e
-#+busybox-e2fsprogs.0e2aa054a89ba26a1e3aea9c7cc829d0e7cda3994a2f46043d276de8bafb7094
-#+busybox-iproute2.3225ae64400729d39edaed1fb0e3d47df1e4f877b843d44f2cb92da0462e913f
-#+busybox-iputils.7447253684f7fefabcbcc87d00ce64eae8e9fbbe5f274d4e05c963ab3db8800e
-#+busybox-net-misc.446a9542cfacca71f2de0fd70b5325879ecdfe599da477adfc57aeb5f6333409
-#+busybox-net-tools.f7f7dcd270ec9abd0f79cf264194a72b14c836d04959bb5cde08ab55057ff9cb
-#+busybox-traceroute.5ca2c7b82bfb4d62f02366e36f1ccb44c68db5061844d6049a09751863d87c1e
-#+busybox-wget.1176a69ae2818c253636f82fdf95e50c593f2383834d6a0a57d4d43879a81c6b
-#+busybox-chpst.39cccdb7708209a1569b7a8db33815af5f1d61efa10252faa0b8264e7939a959
-#+busybox-console.d3b8e864dcf390b31ec11751b6df7a5f173f06bd56d983a2779f878a761a1d60
-#+busybox-getty.02d7031c17c6c72490c8e5a9438731bedf46da6cbd670a1d1c804d2ff9715105
-#+busybox-i2c-tools.a379808754de77a17c73b7509c1b1f77844cc55edc3b256a7a2af2961dff751c
-#+busybox-linux-extra.00a015bd2141b6a53c24e23d05d45da8030a99e117fe957364105901cfa7d844
-#+busybox-mtd-utils.61b8e61bac018a2391197c7ab3acf33a1b0a2d642da92eb4f2d6514953037112
-#+busybox-shadow.8c4e08bcb69931da212ba9764c71c45aeeda5d7bb297e891bc20334e3166461d
-#+busybox-su.71aa0610a3a03ef6976577585f006d3448be1e95292a39a505061e683f650344
-#+busybox-util-linux-priv.9f0b01873475e821b9c19d205d628748e0864371a8942de9ff4ed7ea43c40d1d
-#+busybox-logging.c12a39a65484f62e9500905193b3f16f1f545864d98949ed8f728bef95f93bf3
-#+busybox-cron.14f2aad53b4bc0d04e5b7e68bdd32df6edad9292c4923c1511853f688a25483d
-#+attr.5355db75f87a68c1ac16698301dc4f867698ee419ed694db587e5b963b19e37e
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+diffutils.22606f677eb04a9c3cac724aa92d424b283d1e27c385998ee81dba0f4af7d30b
-#+patch.8db933ca138e85d9e089edb6d824497d96ad49821c32c2b79dfe3fb5200fc59e
-#+flex.5aacea292611a322b9d0faa2d50c8a8e5af41b0e70ae5f0c9ec72bb5c80f59cc
-#+bison.fb825f649759d3c0a4da1e06d237e4da1972cc5eddab72db60ef6ce192e7be16
-#+rsync.32bae1f61ae7b156c8ca3da3197a4a404b97bb75a152e77b8ecb4b45b622d264
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+s6-rc.fa0846c1d52dece9ab323e3c2ae5c7a87e45ec4011585a4a568836b3d4f966f7
-#+s6-portable-utils.6953fd0746de15bae9194af3b9a52330124232b740c48778eb913c6be16d8359
-#+s6-linux-utils.0a8c725b752cc3e6424cff528b790390d50e80ac89d3ed4daa66256735648633
-#+s6-linux-init.095e8972d0bd4128cb90ed1d3c5a6305041320c6be0117f792220ea550a528b3
-#+mdevd.d20f9bfbd6215d253269a9e7790c81665db3510a9d37f866f3ba6dadf610cb2a
-#+s6-dns.5c109299797cc215d8ef491dfe9c58ddfcaf3fd8d350a8acfbaf851a9f904c0c
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
-#+s6-networking.d62b66c213de419795e6c3e1638e04a6504fb155a405c1d40786c5dc07da0905
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
-#+aat.826a87af7d74d90588859a2ee4e981b9ec7bf1ea772424c1b04c908aff760168
-#+confz.76aadf1eaa041da7e5a4bf67db25edee947c8390482a6be851a812f3a4f675cb
-#+containers.d61ff0662b2231f7ca2cff52b0722fce4413b338fb33ea45b94f796b223cdb91
-#+fileset.6b072e59bc4b8a5db97440923584ee26ac5dcfe9933f9ec89b111c5c1bd47d6f
-#+logincaps.aba78cd58abeb220ae49f5b063d11c102f31ed6513e4540503dba26f2bab1f81
-#+snaprep.4fd031deb15f24e43605e231116e55745e2815e07fec96bf2403e1cfd2ed2372
-#+curl.72d004aec91307eba1bcf1146984da632d0a13aee912aa15c2a69349fe053229
-#+git.b05632b64247b7a69a7b8fcc5c9ff04c046b15ba896e47bf7923dad04cf0fc9e
-#+xbps.f488762f51b6c901c0cef990385cd1fc90fade5a9c183723a4fa0c8a42f88dbd
-#+apk-tools.8c27ad371e248cd9a9b0a538f3a184b9c631fa2f2c534e56d91ca4f33c535d72
-#+getent.999e76717e1c18fbf17c2c31c79853c58ad9c1e021d1f9e02e357f183ee8c5c6
-#+getconf.a93f4d61808cb447bfaa885fda7fbf26b843e013bd4566494e2b033f9039585b
-#+iconv.4764dc2e7faf897c268c445f4d25f8233cc9ef95df890e2f271f69da5abe342f
-#+libcap.683f862a53bb1c8c43ddac06a3eb19cee36a6358907a83da8bfaa6cfd57b1ae0
-#+applyuidgid-caps.ae1bdf662aca9ac8aa82c3b74d1fb96260581070b4688f8a0702b1f85ef7f1d2
-#+ccx-utils.6e5508cb77192421cebdf59415d0d277d6d39e38e5fae832100f7c3642d2c274
-#+user-env.eb3cd5a1960689967dee0cec2f172f50286bab038569c5a902d2ed99f357e655
-#+strace.74b29183068f2fcea618d6cbea430e2eef2a570576fcef54d4f8d900a46ff886
-#+mlog.f93b41a0144c38ee34e54f6b6659a1df8c2b208dfd575d8fc472fd9f52fe425f
-#+findutils.f2299ef188fec38248caf926579b05887d354deb57caaa8cd20f3d45ad6e06b7
-#+nawk.6e41b318f0a7ca9942ed0565b4dd1267a29a13a400b493b4bbf5e26d76a04ebf
-#+squashfs-tools.5f619beafa5635e04890e0ae9f89d1e531d2594848403c0adabce5ed5324d016
-#+mandoc.d04de8e1e8df0a619fe06b7739adadc7480455bccb116af08cba3023e0e8305f
-#+tinyssh.d92ac5a6d8d0ecdd6d3da3c7c2ec82d255c138c9c41a7e50a948d355e3d8e2d2
-#+system-config.01e6b4d359faa5eab3161fc10adf226a3e2e3786709e291fb4be320da542c1d8
-#+system-config-rc.45de2fd03ece994fd24f864d46332b2e40cfaff1ad2f3f135a340df63de1faf9
-#+system-config-scripts.d5b8d09ed532a155b52a7dbb382b1f064b7fa8a6a0a8521940ffe1baf795a16b
-#+system-config-init.b2422a2dacb6386d3822ec382d515d09454b817ad09c9484e47834366f3ec902
-#+system-config-zsh.54bb8b5a462dddde10d2063701a734418f1711a0fbd812a74d1a15a58effc18b
-#+busybox-modutils.8681a58e774d7e83169f3c207a24d1a8c26cad191b868c2f6d302aa560b1c877-
\ No newline at end of file
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-dosfstools.fe9dc7453fb1a770b675108e457029a2739c6ca79627db7538ab89592669f157
+#+busybox-e2fsprogs.7259fca6189c8d0ce3f4da6dcb699a78e25fcfed78c245279c0b770dd7307700
+#+busybox-iproute2.804fa48fd6895383b3a6a27c9098e94e1a436679fc570d4a30643c52f032b3d5
+#+busybox-iputils.7e3069a6f610a281caa381c3fd7fdc205c9a333318478953385201a685bad51d
+#+busybox-net-misc.eff784f9de60c2e42d872c2ab63b7296a42dd61b824373f3b649aaeec5c3b214
+#+busybox-net-tools.fb0385bee303901604824fc18dee7e76c4582b61a9b29454cafcca0a3fd5a96c
+#+busybox-traceroute.f5e6c280aed3c3a34be0fd56898b5e9f31123c3e03a5e017c4ad009b521ed555
+#+busybox-wget.ffbfbf22ccd2b9d8d7d3d9bd5f3f6c4c9141086e580dc44faa93070370062f3d
+#+busybox-chpst.a6422550ba62ad83f199cd94bfaa1be7226cb93c9b5a6492948fd239c42e0062
+#+busybox-console.0aafd33cc9f9715ac3b15ddbac444ef9bf53e0fe74799a6c8bbfb69ccd88d3f8
+#+busybox-getty.ebe9b9d5a1f380298264d6851b0eb4c590eb4cd1fda091e78ad5f584439ec1ce
+#+busybox-i2c-tools.2f367203fde2652cb02921830bdc8884e6011f13604d87d41cda5f1044000fc7
+#+busybox-linux-extra.7bdd28daad9eb0b6e9e9fac88e9ab8c938d448e9866c9ddf6044018cedf5f401
+#+busybox-mtd-utils.c7c720c931e698ab9d591e3eea62dd911cb8f6d08fa8e30f736c3e2d9903b7e9
+#+busybox-shadow.e512b567a6c2894806767c440ae099257279aa7870d73f12038a337e63855ba5
+#+busybox-su.7781cb27b148a31fab99ab39032033c61064f1e60222a69f548a881b6a36b702
+#+busybox-util-linux-priv.d80b7538136e963ecc037e86bc4c12eb40278729b53b76fe063372361f6332ae
+#+busybox-logging.ca69ac5c243d70ede4d47c19d6207d58dbfd870d7426c773db1e2c56500a7cbe
+#+busybox-cron.93a1a158bff3b28f54c1b4178086fa55439d871677b32296404a4646fc8be2f3
+#+attr.51e6d376dae2a666eb579f95fba5a46209b70a50068ab5ef136c8aa02a3e02db
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+diffutils.bd9293d5e9a522517591a123da935e0cad52403e6d14842add0c4bf447fcacdd
+#+patch.1225eb800ec6e0421d25728b71fb3e19703373425c5c4ed45ed964ac89212025
+#+flex.a0ca1afbde90c6494bcc4dc039ac1892034358d4fc6c590de40df83f32966126
+#+bison.3cab4d70f4a22a21c792df2e75e4b90d91636cdc95e0585d8e49ec2ae8104bbd
+#+rsync.b51eeb661953517f15c0c59f133700f3fb57b214edd0c9667ad0891427194656
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+s6-rc.b5a43df2dc3f1349fc09edb9cfd7ec25f4c9f5fba6314400c8c031edd3ee7ce9
+#+s6-portable-utils.0b60152cde5b1e8e8e439ecab2233f582e214f0c846014681b99e6d66a4cc3f5
+#+s6-linux-utils.aa097f82e882ae00ab6eefe8950fa4a3e2dd28c22770205b2f805266b4588772
+#+s6-linux-init.9e5e4b670dda8760392dcbb20bdd3a97114c050f1bab772d5102afd48c0766b4
+#+mdevd.4154733913ff780b3108b9a5ef0604db3be2e24753361e698a5eb2909c1a7b2a
+#+s6-dns.67acdccf5a6475315dca3557e28a059d5b3a6e3decb28f9fec04ce1a187104d9
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
+#+s6-networking.c4443af7974fc56303e1f5d7e17ebe4a1f7b4d9fd1a941f8d4e408d1398277df
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
+#+aat.eb95fdd8cff549eede66a93990d8b9dd5682c49d131fa373d28d1e2d396a83da
+#+confz.976e2e5eca44f9e2f3aa156dbac5550950205e2074ddd5a2182f51f962de20ab
+#+containers.15e85b61935af2e77d7f958996f6df6455b6a5cd79a31026d0cb91b559aa4920
+#+fileset.d409c0ed822b5b2c83ce61f351d3046168445548f4c2e8c556fb5203ad578a49
+#+logincaps.6380983a04c47da978fe36b88e521c7b5f650767ff37050239fec6ef7e9ee8ff
+#+snaprep.1d83e4af0a7250113b4c28a48d5156e6cb3058123c14c7f24e5c54019097a41b
+#+curl.455a5468933be7168f5e430072b8c9797aa445d106edadbacb5d23be94e8345a
+#+git.b9176788309f592a4a9403f55b46648f54ceeb6ebcf4ca21701294d2d62d9237
+#+xbps.797b022f57edff25bf117f64ae104092e0e1d2bcff17848b6f66df6513bf9c7a
+#+apk-tools.a22aea46546549aa4b3da4621ef54c77d2e646765fb6424e44cf884f15513f30
+#+getent.8a0c3b9665c430990fecc07f769f33a2355e796e1e19408fb5d226952d67ac95
+#+getconf.a7eca343623c7e4c27e636a93d51045c4ee43efd673c751e89cd76c193e5d4cc
+#+iconv.7f3e7aa47b62d05f22800899d9d3d856a2981c823e473bf6a198a8657885dd2b
+#+libcap.7bbb6a623d348970799e44e4552e5ccff8f43619187ce9d2c527ab2f74619d31
+#+applyuidgid-caps.bdd29d106820b66373e56e8c94e16755aacbae3475d21f4911deaa38b04795fc
+#+ccx-utils.b26547dc8a2b883ec4c46581151c3173c1b5e43d55b79081366754db05f6d777
+#+user-env.e7a492ded2a3cfe5997fe9164e39f769e9f90bb3c01f724729109923de6d4410
+#+strace.9c21a3cc83395beea41e216d0d56782e23982d85812983ac7526859281bf5d52
+#+mlog.76ed22dee95284d8874841b434c8b8ee5aff5d55cbcba56d3224c416bb7af3b3
+#+findutils.6098c312e4bc7e3b5737a2aef7eb3e5b3cdd729df8f2521b16d2119b79546cec
+#+nawk.3a4d5fc4f5da910980b1f73ac9105d3581359e75829f79ed52975a8e3eff81bb
+#+squashfs-tools.b9e99cc58c811c8033edbeb9db0a21acab2a667b0206e100d7e1b5411e31afd5
+#+mandoc.a3ca9919c5bc957261e76ff427fcef1d9a907d8731065fe1449bb6b72a3bea8e
+#+tinyssh.07da814b366eba0d215407d04434309f11728aba1ead68aa68511de582016f43
+#+system-config.d100fe21dcee292e769fda51de40f08bed10b2a133a4f7dffa4477daea5f1033
+#+system-config-rc.218b9e6822eb345e6949c50c610aea5be3553e4f871ccbc4fe81256e5c3f661a
+#+system-config-scripts.a825a480ce02cb857521a750f8f2f1bde5c8518dda72c6823ab68d72f4ea67e9
+#+system-config-init.22dae3a88ed9a1e48a96c390d6c3b58974e813aa30cfd3e1bddd32a0477e2c17
+#+system-config-zsh.888d7717482c0767f73ef4558c417150d5d29530a5d32abf7d39f2411c3532ac
+#+busybox-modutils.649244f8550b31e528f518bd1ab086c3d23e31d8f6ce9cf98234a61365df5016+
\ No newline at end of file
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -123,20 +123,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +49,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -122,22 +122,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+patch.8db933ca138e85d9e089edb6d824497d96ad49821c32c2b79dfe3fb5200fc59e
-#+flex.5aacea292611a322b9d0faa2d50c8a8e5af41b0e70ae5f0c9ec72bb5c80f59cc
-#+bison.fb825f649759d3c0a4da1e06d237e4da1972cc5eddab72db60ef6ce192e7be16
-#+libseccomp.71fe429cb9b38b78e2ce21d64cec83b2b46667d489f41e4b1a5a60de0f2d32b7
-#+error-standalone.9226a03f8ff8e7e3b5be21d6c912a43e6de5d6108ecf41c30c9b36d7a0dc1f5e
-#+argp-standalone.9c3a10d6609c29aef8517ca4f8889573d5a8c7f39531f2715b3bce02e4e378d7
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+patch.1225eb800ec6e0421d25728b71fb3e19703373425c5c4ed45ed964ac89212025
+#+flex.a0ca1afbde90c6494bcc4dc039ac1892034358d4fc6c590de40df83f32966126
+#+bison.3cab4d70f4a22a21c792df2e75e4b90d91636cdc95e0585d8e49ec2ae8104bbd
+#+libseccomp.bbb8761029ac74c8d18fc9f9670e8ccabdf54a27497742038ae6cab998bd648c
+#+error-standalone.218ef305d3ec36db048f1f8774f25422b73edf6cbbeb4828cf739a08a7800e24
+#+argp-standalone.e727469abd8b88cb5c4c76cf80cea0d961ac74fcdc7a84c51fd561931e7d0981
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -130,20 +130,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
@@ -79,20 +79,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -89,20 +89,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/execline:bootstrap b/variants/root-x86_64/execline:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+skalibs.21bc36e2dd6f695d2474a0e10fb003e9c106c2e9b69ce13805353b19342c70fe
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+skalibs.64489104822b0bf7674af982f66bfcda3334b9718dea6bf2f720bd0dd82abd7c
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -27,7 +27,7 @@ export CFLAGS="-O2 -ggdb"
 	--dynlibdir="${prefix}/library.so" \
 	--libdir="${prefix}/library" \
 	--includedir="${prefix}/include" \
-	--with-sysdeps='/versions/skalibs.21bc36e2dd6f695d2474a0e10fb003e9c106c2e9b69ce13805353b19342c70fe/sysdeps' \
+	--with-sysdeps='/versions/skalibs.64489104822b0bf7674af982f66bfcda3334b9718dea6bf2f720bd0dd82abd7c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -61,20 +61,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
@@ -86,22 +86,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -132,20 +132,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -127,20 +127,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
-#+curl.72d004aec91307eba1bcf1146984da632d0a13aee912aa15c2a69349fe053229
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
+#+curl.455a5468933be7168f5e430072b8c9797aa445d106edadbacb5d23be94e8345a
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
@@ -104,20 +104,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/gnu-make:bootstrap b/variants/root-x86_64/gnu-make:bootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
+mcm=/versions/musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
@@ -78,20 +78,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -120,20 +120,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
@@ -93,20 +93,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -126,20 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -125,20 +125,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+libmd.6e6876b0ff98b854802cc2531fbc330af9aaac6ceca6acbb33e54ba3ad6da41f
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+libmd.cfe735fb698b8429098ec27b08445942f68cf22fa051cff76bc1743c2da58ef1
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -121,20 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+pkgconf-pkg-config.27bd89d2a71510509379204444af2af18e3d1f55c16e7b0190fa1f05ee50d029
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+pkgconf-pkg-config.0cad8e56f082b98336c9640c2415c9ddc2f2b6e0426b3f64b7210af40ff06855
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -119,20 +119,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libcap:bootstrap b/variants/root-x86_64/libcap:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+flex.5aacea292611a322b9d0faa2d50c8a8e5af41b0e70ae5f0c9ec72bb5c80f59cc
-#+bison.fb825f649759d3c0a4da1e06d237e4da1972cc5eddab72db60ef6ce192e7be16
-#+musl-fts.31b576132ef8c7d84840e8c389ec8248e3bc7eedb43ea6a8f988e1b43359336f
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+flex.a0ca1afbde90c6494bcc4dc039ac1892034358d4fc6c590de40df83f32966126
+#+bison.3cab4d70f4a22a21c792df2e75e4b90d91636cdc95e0585d8e49ec2ae8104bbd
+#+musl-fts.0d8405085b24ba6d406f8205bc56bbdbb066269e3db45419b0dd41bd696597fa
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -134,20 +134,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+zstd.56043719382a4006fc1850ab4468db81cea2c9f56025c3fb39141dac2a4821f1
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+zstd.0e5e52b427b7170936461f538f4b3693f70ba251809929b15223c5dc21cfe35a
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
@@ -98,20 +98,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -121,20 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+ca-certificates-wip-donotuse.c58c9dfe990ee58589c6e5825e785e690694c05dc6ded8d1d46af04e3980b43b
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+ca-certificates-wip-donotuse.c912b03687e49dc8f56f0ecf66fbae86551da73fd4c137969577c092e2e57ddf
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -99,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/versions/ca-certificates-wip-donotuse.c58c9dfe990ee58589c6e5825e785e690694c05dc6ded8d1d46af04e3980b43b/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.c912b03687e49dc8f56f0ecf66fbae86551da73fd4c137969577c092e2e57ddf/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
@@ -148,20 +148,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+pkgconf-pkg-config.27bd89d2a71510509379204444af2af18e3d1f55c16e7b0190fa1f05ee50d029
-#+gperf.c5f117b52305c23e5510acc63b293a746c8a30530fc9e406b186a0f515a6e569
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+pkgconf-pkg-config.0cad8e56f082b98336c9640c2415c9ddc2f2b6e0426b3f64b7210af40ff06855
+#+gperf.4dd6643497d31ffd7f38e34ef91e1e2b4d319eda59eb5faa36214795bf0fe701
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -126,20 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -126,20 +126,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-modutils.8681a58e774d7e83169f3c207a24d1a8c26cad191b868c2f6d302aa560b1c877
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+findutils.f2299ef188fec38248caf926579b05887d354deb57caaa8cd20f3d45ad6e06b7
-#+diffutils.22606f677eb04a9c3cac724aa92d424b283d1e27c385998ee81dba0f4af7d30b
-#+patch.8db933ca138e85d9e089edb6d824497d96ad49821c32c2b79dfe3fb5200fc59e
-#+flex.5aacea292611a322b9d0faa2d50c8a8e5af41b0e70ae5f0c9ec72bb5c80f59cc
-#+bison.fb825f649759d3c0a4da1e06d237e4da1972cc5eddab72db60ef6ce192e7be16
-#+rsync.32bae1f61ae7b156c8ca3da3197a4a404b97bb75a152e77b8ecb4b45b622d264
-#+zstd.56043719382a4006fc1850ab4468db81cea2c9f56025c3fb39141dac2a4821f1
-#+libelf.a661ad7164ac33b216d2c7ad0d4418eb193ab8fea2dce5859c47b5493018eda5
-#+pkgconf-pkg-config.27bd89d2a71510509379204444af2af18e3d1f55c16e7b0190fa1f05ee50d029
-#+nawk.6e41b318f0a7ca9942ed0565b4dd1267a29a13a400b493b4bbf5e26d76a04ebf
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-modutils.649244f8550b31e528f518bd1ab086c3d23e31d8f6ce9cf98234a61365df5016
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+findutils.6098c312e4bc7e3b5737a2aef7eb3e5b3cdd729df8f2521b16d2119b79546cec
+#+diffutils.bd9293d5e9a522517591a123da935e0cad52403e6d14842add0c4bf447fcacdd
+#+patch.1225eb800ec6e0421d25728b71fb3e19703373425c5c4ed45ed964ac89212025
+#+flex.a0ca1afbde90c6494bcc4dc039ac1892034358d4fc6c590de40df83f32966126
+#+bison.3cab4d70f4a22a21c792df2e75e4b90d91636cdc95e0585d8e49ec2ae8104bbd
+#+rsync.b51eeb661953517f15c0c59f133700f3fb57b214edd0c9667ad0891427194656
+#+zstd.0e5e52b427b7170936461f538f4b3693f70ba251809929b15223c5dc21cfe35a
+#+libelf.0aa0e2bbf3e29ee7e52f1152b7cfae30f0dbe3c2291525213aa82eaea7a27412
+#+pkgconf-pkg-config.0cad8e56f082b98336c9640c2415c9ddc2f2b6e0426b3f64b7210af40ff06855
+#+nawk.3a4d5fc4f5da910980b1f73ac9105d3581359e75829f79ed52975a8e3eff81bb
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
@@ -122,20 +122,29 @@ function mod_path(s) {
 }
 $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/lnstools:bootstrap b/variants/root-x86_64/lnstools:bootstrap
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+skalibs.21bc36e2dd6f695d2474a0e10fb003e9c106c2e9b69ce13805353b19342c70fe
-#+execline.812a2a0f279238dc21fab40a9b0e0619890805e8283b651209663ab74a9b53e0
-#+libcap.4097c8112475f49e6846ec3c4132baa7c1858b5811c5da4abd17870a21773743
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+skalibs.64489104822b0bf7674af982f66bfcda3334b9718dea6bf2f720bd0dd82abd7c
+#+execline.64a7f04529a1b2cfd55e8448f84cccbbcc07732bf4024696f7cde7d748d112c9
+#+libcap.f607d1d12384f4e0420f015d89ef75e3ed4adfd20f8b2bf66e5d390b170ae6e8
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
@@ -60,20 +60,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ccx-utils.6e5508cb77192421cebdf59415d0d277d6d39e38e5fae832100f7c3642d2c274
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ccx-utils.b26547dc8a2b883ec4c46581151c3173c1b5e43d55b79081366754db05f6d777
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
@@ -121,22 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -120,20 +120,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
@@ -113,20 +113,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -82,20 +82,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment
@@ -1,51 +1,51 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-dosfstools.cede36089a529747add4b87d7d9fdf416216fde7c4907967f0f810072385320e
-#+busybox-e2fsprogs.0e2aa054a89ba26a1e3aea9c7cc829d0e7cda3994a2f46043d276de8bafb7094
-#+busybox-iproute2.3225ae64400729d39edaed1fb0e3d47df1e4f877b843d44f2cb92da0462e913f
-#+busybox-iputils.7447253684f7fefabcbcc87d00ce64eae8e9fbbe5f274d4e05c963ab3db8800e
-#+busybox-net-misc.446a9542cfacca71f2de0fd70b5325879ecdfe599da477adfc57aeb5f6333409
-#+busybox-net-tools.f7f7dcd270ec9abd0f79cf264194a72b14c836d04959bb5cde08ab55057ff9cb
-#+busybox-traceroute.5ca2c7b82bfb4d62f02366e36f1ccb44c68db5061844d6049a09751863d87c1e
-#+busybox-wget.1176a69ae2818c253636f82fdf95e50c593f2383834d6a0a57d4d43879a81c6b
-#+busybox-chpst.39cccdb7708209a1569b7a8db33815af5f1d61efa10252faa0b8264e7939a959
-#+busybox-console.d3b8e864dcf390b31ec11751b6df7a5f173f06bd56d983a2779f878a761a1d60
-#+busybox-getty.02d7031c17c6c72490c8e5a9438731bedf46da6cbd670a1d1c804d2ff9715105
-#+busybox-i2c-tools.a379808754de77a17c73b7509c1b1f77844cc55edc3b256a7a2af2961dff751c
-#+busybox-linux-extra.00a015bd2141b6a53c24e23d05d45da8030a99e117fe957364105901cfa7d844
-#+busybox-mtd-utils.61b8e61bac018a2391197c7ab3acf33a1b0a2d642da92eb4f2d6514953037112
-#+busybox-shadow.8c4e08bcb69931da212ba9764c71c45aeeda5d7bb297e891bc20334e3166461d
-#+busybox-su.71aa0610a3a03ef6976577585f006d3448be1e95292a39a505061e683f650344
-#+busybox-util-linux-priv.9f0b01873475e821b9c19d205d628748e0864371a8942de9ff4ed7ea43c40d1d
-#+busybox-logging.c12a39a65484f62e9500905193b3f16f1f545864d98949ed8f728bef95f93bf3
-#+busybox-cron.14f2aad53b4bc0d04e5b7e68bdd32df6edad9292c4923c1511853f688a25483d
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+mdev-scripts.1e23a6ffc45d2034cd397eb0b8524473204065117dea6d4c032ddf048ae0f3c4
-#+mdevd.d20f9bfbd6215d253269a9e7790c81665db3510a9d37f866f3ba6dadf610cb2a
-#+busybox-modutils.8681a58e774d7e83169f3c207a24d1a8c26cad191b868c2f6d302aa560b1c877-
\ No newline at end of file
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-dosfstools.fe9dc7453fb1a770b675108e457029a2739c6ca79627db7538ab89592669f157
+#+busybox-e2fsprogs.7259fca6189c8d0ce3f4da6dcb699a78e25fcfed78c245279c0b770dd7307700
+#+busybox-iproute2.804fa48fd6895383b3a6a27c9098e94e1a436679fc570d4a30643c52f032b3d5
+#+busybox-iputils.7e3069a6f610a281caa381c3fd7fdc205c9a333318478953385201a685bad51d
+#+busybox-net-misc.eff784f9de60c2e42d872c2ab63b7296a42dd61b824373f3b649aaeec5c3b214
+#+busybox-net-tools.fb0385bee303901604824fc18dee7e76c4582b61a9b29454cafcca0a3fd5a96c
+#+busybox-traceroute.f5e6c280aed3c3a34be0fd56898b5e9f31123c3e03a5e017c4ad009b521ed555
+#+busybox-wget.ffbfbf22ccd2b9d8d7d3d9bd5f3f6c4c9141086e580dc44faa93070370062f3d
+#+busybox-chpst.a6422550ba62ad83f199cd94bfaa1be7226cb93c9b5a6492948fd239c42e0062
+#+busybox-console.0aafd33cc9f9715ac3b15ddbac444ef9bf53e0fe74799a6c8bbfb69ccd88d3f8
+#+busybox-getty.ebe9b9d5a1f380298264d6851b0eb4c590eb4cd1fda091e78ad5f584439ec1ce
+#+busybox-i2c-tools.2f367203fde2652cb02921830bdc8884e6011f13604d87d41cda5f1044000fc7
+#+busybox-linux-extra.7bdd28daad9eb0b6e9e9fac88e9ab8c938d448e9866c9ddf6044018cedf5f401
+#+busybox-mtd-utils.c7c720c931e698ab9d591e3eea62dd911cb8f6d08fa8e30f736c3e2d9903b7e9
+#+busybox-shadow.e512b567a6c2894806767c440ae099257279aa7870d73f12038a337e63855ba5
+#+busybox-su.7781cb27b148a31fab99ab39032033c61064f1e60222a69f548a881b6a36b702
+#+busybox-util-linux-priv.d80b7538136e963ecc037e86bc4c12eb40278729b53b76fe063372361f6332ae
+#+busybox-logging.ca69ac5c243d70ede4d47c19d6207d58dbfd870d7426c773db1e2c56500a7cbe
+#+busybox-cron.93a1a158bff3b28f54c1b4178086fa55439d871677b32296404a4646fc8be2f3
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+mdev-scripts.7cad406c60527f2590351678f32094fb8f8ea7392ca99adaeace27eae6fdad7f
+#+mdevd.4154733913ff780b3108b9a5ef0604db3be2e24753361e698a5eb2909c1a7b2a
+#+busybox-modutils.649244f8550b31e528f518bd1ab086c3d23e31d8f6ce9cf98234a61365df5016+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
@@ -95,20 +95,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/musl-cross-make b/variants/root-x86_64/musl-cross-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -130,20 +130,29 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 # $2 == "x86_64-linux-musl" && $3 == "include" { link(r1($0)) }
 $2 == "x86_64-linux-musl" && $3 == "include" && $4 == "linux" { link(s1("include", r1($0))) }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-0 b/variants/root-x86_64/musl-cross-make:bootstrap-0
@@ -81,20 +81,29 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 # $2 == "x86_64-linux-musl" && $3 == "include" { link(r1($0)) }
 $2 == "x86_64-linux-musl" && $3 == "include" && $4 == "linux" { link(s1("include", r1($0))) }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-1 b/variants/root-x86_64/musl-cross-make:bootstrap-1
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.263ebc5aa729041d1f0e94be0c20d2e808b000f30117ed31a7188cc3db7ce5d5
+#+musl-cross-make.2cd1a8a0897f481fbfecd4315d51c576bd221459b7999b0a01cda01bed7895ac
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -21,7 +21,7 @@ prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
-bootstrap=/versions/musl-cross-make.263ebc5aa729041d1f0e94be0c20d2e808b000f30117ed31a7188cc3db7ce5d5
+bootstrap=/versions/musl-cross-make.2cd1a8a0897f481fbfecd4315d51c576bd221459b7999b0a01cda01bed7895ac
 "$bootstrap/bin/x86_64-linux-musl-gcc" --version
 
 cat >musl-cross-make/config.mak <<EOF
@@ -90,20 +90,29 @@ $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-",
 # $2 == "x86_64-linux-musl" && $3 == "include" { link(r1($0)) }
 $2 == "x86_64-linux-musl" && $3 == "include" && $4 == "linux" { link(s1("include", r1($0))) }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
@@ -92,20 +92,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+bison.fb825f649759d3c0a4da1e06d237e4da1972cc5eddab72db60ef6ce192e7be16
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+bison.3cab4d70f4a22a21c792df2e75e4b90d91636cdc95e0585d8e49ec2ae8104bbd
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
@@ -71,20 +71,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
@@ -84,20 +84,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
-#+ocaml_intrinsics_kernel.930a1e07f14304c8a08614c0f8dca127aafb1d6d832577c778b0f569e6a69498
-#+ocaml-sexplib0.046c60a766c9bcf76918d411ba2af32cce073300d750655184def52f1ddc2868
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
+#+ocaml_intrinsics_kernel.f864e4139a3c47bb58c3c51716d1a1133b7b4193d34193a764be4c2363e54f29
+#+ocaml-sexplib0.982a7a0c9f46963d6f2a86f138232f4cfda549ec72d9b82b4738c8b5e9092671
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
@@ -95,22 +95,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
-#+ocaml-astring.57817f7990228fe276c6ce907bdf1d9b123d258a3622026e6e1441bb4e489a67
-#+ocaml-fpath.fa6c0c2e29b06f87b92c7bed9c6a1ea2c9c6e4a5fed5c4d6fed5dc59f520f494
-#+ocaml-rresult.10e95ad2d49c714eb8d6519fe4908820d0004ee673b25adb298e63761a4ece1a
-#+ocaml-fmt.12fd4edab28ce618d0a3633f2a6408d9fa878757f8201782b5f1d5e6d85030db
-#+ocaml-logs.ee68aebe8c5acc94e2adb62321a077b165bd231f7f3a1bc1f8f80de57bbbdc8d
-#+ocaml-mtime.83ea56fecf7d2849062fe867eb5abd0d887cb02b64c787023f0ef0ad56da3a50
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
+#+ocaml-astring.0feceb8447f9bef3c7b08306eacc29a1dddbabcd0abdf0724bbf7e753ee4a5fb
+#+ocaml-fpath.6db25f99237ee034f22fea5bcc2edda800de02651be7b7f5394e190127f7e4f5
+#+ocaml-rresult.c73bb44a8db7f3d6c9ca26ec250b7a66a14ac1a28d991d798e240fb47af25e6d
+#+ocaml-fmt.07281eeb42a2c3f949a6f59d0cdad5ee5237a29da6a86feccc05b74988445ecf
+#+ocaml-logs.d150c1385cb5297d1c5482804148d7776278b1f4a68a5acd591f34385d0defce
+#+ocaml-mtime.22e78c701e9bb1ef790fb8c2fe726645ac73c7bef75c2ed460feacbd692e8b76
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
@@ -94,22 +94,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
@@ -91,22 +91,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+netbsd-curses.bb57795aea8fc3b593b6b1bfa205481dca8a4fc778833863dcd6f85bf04644bf
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+netbsd-curses.ed23772837f681ce0b2fcb8e64a00516f4ee958f9e546c4dc2a71dcffb0d99ec
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/versions/ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7"
+stdlib="$pthbs_destdir/versions/ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
@@ -125,22 +125,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
-#+ocaml-cmdliner.fe9bd13cea5038fa24c594a6574b7bba46b845e7e12f894f484fed6927f20c00
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
+#+ocaml-cmdliner.0a5afe8377e71948af8641bf0577c223b07fd5749645ca88f7fe28792122128f
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
@@ -89,22 +89,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
-#+ocaml-astring.57817f7990228fe276c6ce907bdf1d9b123d258a3622026e6e1441bb4e489a67
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
+#+ocaml-astring.0feceb8447f9bef3c7b08306eacc29a1dddbabcd0abdf0724bbf7e753ee4a5fb
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
@@ -89,22 +89,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
-#+ocaml-mtime.83ea56fecf7d2849062fe867eb5abd0d887cb02b64c787023f0ef0ad56da3a50
-#+ocaml-cmdliner.fe9bd13cea5038fa24c594a6574b7bba46b845e7e12f894f484fed6927f20c00
-#+ocaml-fmt.12fd4edab28ce618d0a3633f2a6408d9fa878757f8201782b5f1d5e6d85030db
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
+#+ocaml-mtime.22e78c701e9bb1ef790fb8c2fe726645ac73c7bef75c2ed460feacbd692e8b76
+#+ocaml-cmdliner.0a5afe8377e71948af8641bf0577c223b07fd5749645ca88f7fe28792122128f
+#+ocaml-fmt.07281eeb42a2c3f949a6f59d0cdad5ee5237a29da6a86feccc05b74988445ecf
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
@@ -94,22 +94,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
-#+ocaml-compiler-libs.d90907b4f7b9c9d7a5f657e4df8d9d8920933322f09dea86be28fd9657ea6c58
-#+ocaml-cppo.a7ff1d3ea475851a6f9b14fffbf7ac322cae3aeb395a1decf51ec952511fbce1
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocaml-ppx_derivers.10ce2d4a2c68d8b9600aeef5c8d8d2ba5ece71ccd179a4a14ebcdc193c63a2df
-#+ocaml-ppxlib.39229de67f08821331785c2837550c2f2b4cc6a2b0cad194515534f385bdcdbe
-#+ocaml-sexplib0.046c60a766c9bcf76918d411ba2af32cce073300d750655184def52f1ddc2868
-#+ocaml-stdlib-shims.3ad2e075e509280692060928911230a210309ec658c45ec9d3c4ebae22cb046a
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
+#+ocaml-compiler-libs.4071f8edc6801cd071b1543752411e462a966b55356ce074dc93d982a7589c68
+#+ocaml-cppo.6efffdb44266546ec46d881130b6ae4a9fad59639c6fa8a50774a9bb7f899e8c
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocaml-ppx_derivers.03151bb121ad2c797ff83aa48d82447292a99281b61e678eefb41734a09725b7
+#+ocaml-ppxlib.076af9d64c3960271dd154f6f97ad442d3f26da10b7c1481c4dc7683213bdae4
+#+ocaml-sexplib0.982a7a0c9f46963d6f2a86f138232f4cfda549ec72d9b82b4738c8b5e9092671
+#+ocaml-stdlib-shims.1022632a813ec7aa3b02237fdf7ba549aa46c0594c7a3046d1b6082d8c495494
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
@@ -98,22 +98,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
-#+ocaml-compiler-libs.d90907b4f7b9c9d7a5f657e4df8d9d8920933322f09dea86be28fd9657ea6c58
-#+ocaml-ppx_derivers.10ce2d4a2c68d8b9600aeef5c8d8d2ba5ece71ccd179a4a14ebcdc193c63a2df
-#+ocaml-sexplib0.046c60a766c9bcf76918d411ba2af32cce073300d750655184def52f1ddc2868
-#+ocaml-stdlib-shims.3ad2e075e509280692060928911230a210309ec658c45ec9d3c4ebae22cb046a
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
+#+ocaml-compiler-libs.4071f8edc6801cd071b1543752411e462a966b55356ce074dc93d982a7589c68
+#+ocaml-ppx_derivers.03151bb121ad2c797ff83aa48d82447292a99281b61e678eefb41734a09725b7
+#+ocaml-sexplib0.982a7a0c9f46963d6f2a86f138232f4cfda549ec72d9b82b4738c8b5e9092671
+#+ocaml-stdlib-shims.1022632a813ec7aa3b02237fdf7ba549aa46c0594c7a3046d1b6082d8c495494
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
@@ -96,22 +96,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-topkg.255ea0f0bb3b19d406a077bbb52bf377bae5ca71d69675dc9faaa1f211a18ce1
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-topkg.f058e695a944d048d0d16fb6208661e01291cdd50edb7ab2e4e86fa7c1043300
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
@@ -88,22 +88,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
@@ -91,22 +91,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
@@ -90,22 +90,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+ocaml-findlib.d38c4182f9cf91fa5f5be59866e47b201108b1694a1c273dfffe07920b8569ae
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+ocaml-findlib.2dded429e91777c7a35753e05160c9398484f22eaac86fa6211532a885c44a22
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
@@ -87,22 +87,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml.environment b/variants/root-x86_64/ocaml.environment
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
-#+ocamlbuild.6447636be4e6c09a395fa4cae8b9b23b7f2055948698583c8cfbb191ef2086ae
-#+ocaml-base.6d6aaedb2d0084fcc395ed59b49059bc2ec888f848d7777a2a19e4319175b48c
-#+opam.69a6d4570367bdb733c65a15a7a8a686b5a36d420f57440f0c6c22194ffaf3c5
-#+ocaml-bos.65043ef06a27fe9787a80f2abeccd429f093add3221f12a8e68160a92de2cf43
-#+ocaml-lun.750d4c182e7167288f820e095654e54cbac1d3185c0a7e594cda50436083c865
-#+ocaml-ppx_deriving.9531c18888db1661b9caa0f46d55e63ace51bc1e5ae779f195380d4bff2ddbc3-
\ No newline at end of file
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
+#+ocamlbuild.8ed3821a4de7c66dd1a050797865beb59f998606683244f1a862867eb50aa70c
+#+ocaml-base.c4f9f31b9b28b315f3cafbdb95c7bd7126edbc6c84df4b96a7c90b8b69b8c7fb
+#+opam.410808a9850be1bd7d7abcb0290ed844db3ca3e1729693961fcc89c674b081f5
+#+ocaml-bos.a1ed3e06fb1686e7894b93438ceea9b4821d501c4a65ea3e25bfc7a5f88a5cfe
+#+ocaml-lun.f2dad8bbc9ac19d70f932f4b6026de555742926dfe5354cfb6719e7e3506afc8
+#+ocaml-ppx_deriving.e3bae924232f1a2d5a3d5902f22c52008c59c5a56935be7a8838ec34762f08f8+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -107,23 +107,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
+$2 == "env" { link($0); next }
 $2 == ".env-template" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "env" { link($0); next }
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
@@ -84,22 +84,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/versions/ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7"
+stdlib="$pthbs_destdir/versions/ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
@@ -110,22 +110,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+diffutils.22606f677eb04a9c3cac724aa92d424b283d1e27c385998ee81dba0f4af7d30b
-#+patch.8db933ca138e85d9e089edb6d824497d96ad49821c32c2b79dfe3fb5200fc59e
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+getconf.a93f4d61808cb447bfaa885fda7fbf26b843e013bd4566494e2b033f9039585b
-#+ocaml.c2d641d922f4afd28e2abe11a095e4aff46b9d6a7e3a82744026c152187e1ea7
-#+dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+diffutils.bd9293d5e9a522517591a123da935e0cad52403e6d14842add0c4bf447fcacdd
+#+patch.1225eb800ec6e0421d25728b71fb3e19703373425c5c4ed45ed964ac89212025
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+getconf.a7eca343623c7e4c27e636a93d51045c4ee43efd673c751e89cd76c193e5d4cc
+#+ocaml.252fde6dd332b3ade12733d04403ab074205b1add8ea1205e029352598013508
+#+dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/versions/dune.d7014323404da2f5bb57489a314d14ec6ee2b3b5f507a365741d7124bfccfd59/command/dune' \
+	--with-dune='/versions/dune.57ff5db672b88eb6f506cb02f301f88075f0451cd2c291512e4098169a2a146e/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
@@ -115,22 +115,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -121,20 +121,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -126,20 +126,29 @@ $1!="."{exit 1}
 
 $2 == ".env-template" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config
@@ -1,31 +1,31 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+pkgconf.728cc77b8831164a5eff81a8669c44d65aa5236c71430eb52e30a388bab58df2
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+pkgconf.14b37cc9a2ac824b045410e9240afc78aa42a8d503e339ed2a8044a9d692dcaf
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -120,20 +120,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
@@ -66,20 +66,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/pthbs-sandbox-rootns b/variants/root-x86_64/pthbs-sandbox-rootns
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+execline.812a2a0f279238dc21fab40a9b0e0619890805e8283b651209663ab74a9b53e0
-#+lnstools.e31a2c2955f87271cc6d8d2f4e62c689bc06e770cb4c669d29c76508c6da4036
-#+sandbox_rootfs.fbf39b71bbc7eaf1dd3a132344489b5a35512c1a9b4cea41b23850ccfd95b82d
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+execline.64a7f04529a1b2cfd55e8448f84cccbbcc07732bf4024696f7cde7d748d112c9
+#+lnstools.b6963fff0032d9956e93d53d92045c201103112d175cc996b3362112cc7cd65a
+#+sandbox_rootfs.117c0614128896733a92d37b5c216bcd3c2b1c11614c8a83061eda2aa69af092
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c:sandbox-rootns.in
 
diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+nawk.6e41b318f0a7ca9942ed0565b4dd1267a29a13a400b493b4bbf5e26d76a04ebf
-#+popt.f059bea8fccb9f40e4a84d292948266012002c0e5a283bbc2f761af2c7b67078
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
-#+zstd.56043719382a4006fc1850ab4468db81cea2c9f56025c3fb39141dac2a4821f1
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+nawk.3a4d5fc4f5da910980b1f73ac9105d3581359e75829f79ed52975a8e3eff81bb
+#+popt.2714be74e6c25666783a0c15be4a7b1b72f1ce0505d0661138e8d2771df5ddbc
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
+#+zstd.0e5e52b427b7170936461f538f4b3693f70ba251809929b15223c5dc21cfe35a
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -130,20 +130,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -82,20 +82,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -81,20 +81,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -83,20 +83,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -81,20 +81,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+s6-dns.5c109299797cc215d8ef491dfe9c58ddfcaf3fd8d350a8acfbaf851a9f904c0c
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+s6-dns.67acdccf5a6475315dca3557e28a059d5b3a6e3decb28f9fec04ce1a187104d9
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -90,20 +90,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -81,20 +81,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.755c4d46d02679fce98f992cce378bad183979f69be61cba15749095f056d98d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.5ef42bfb2fc2998c5fe2fc52ab88cad31822341a6cbfc73bc4d0fc7a4e43377c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -83,20 +83,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/sandbox_rootfs b/variants/root-x86_64/sandbox_rootfs
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
-#+skalibs.21bc36e2dd6f695d2474a0e10fb003e9c106c2e9b69ce13805353b19342c70fe
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
+#+skalibs.64489104822b0bf7674af982f66bfcda3334b9718dea6bf2f720bd0dd82abd7c
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
diff --git a/variants/root-x86_64/sandbox_rootns.environment b/variants/root-x86_64/sandbox_rootns.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.e31a2c2955f87271cc6d8d2f4e62c689bc06e770cb4c669d29c76508c6da4036
-#+sandbox_rootfs.fbf39b71bbc7eaf1dd3a132344489b5a35512c1a9b4cea41b23850ccfd95b82d
-#+pthbs-sandbox-rootns.97d703eac737fdcace09050983c97868c3f9dc7118efcd31f08cff05f2df1f7c-
\ No newline at end of file
+#+lnstools.b6963fff0032d9956e93d53d92045c201103112d175cc996b3362112cc7cd65a
+#+sandbox_rootfs.117c0614128896733a92d37b5c216bcd3c2b1c11614c8a83061eda2aa69af092
+#+pthbs-sandbox-rootns.d6d98f837e57442d81b54fa8a8ab2c1dddf408bc665c1a8960fcd11a2afe3224+
\ No newline at end of file
diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -83,20 +83,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/skalibs:bootstrap b/variants/root-x86_64/skalibs:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.f9d9e794d1bfa37b85facbfe6ccf77f7bcd43bf567c7cb957aa83fa1b5238b1f
-#+gnu-make.a1fef9dc7a7456db69d2d9d0a5879e9e57eb8e4e6ac92fb10f7a6f86b8a5d3c4
-#+busybox.40a936a03417824f18a07db2bcc82aac32e43d3082aa96831a7d60432089efd8
+#+musl-cross-make.1cae9d4b69542792d7634b489495a78e63d8d451faf985372b091d0673799114
+#+gnu-make.fd474cac7a06e711e99325afabc1d4ab5c7362847185ef42c4f0d6de52cf7176
+#+busybox.2943e8277440c840bf23cdff1cbb8db92b47ab5eb016b173235d85afd3d7399c
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -56,20 +56,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
@@ -85,22 +85,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+attr.5355db75f87a68c1ac16698301dc4f867698ee419ed694db587e5b963b19e37e
-#+zstd.56043719382a4006fc1850ab4468db81cea2c9f56025c3fb39141dac2a4821f1
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+attr.51e6d376dae2a666eb579f95fba5a46209b70a50068ab5ef136c8aa02a3e02db
+#+zstd.0e5e52b427b7170936461f538f4b3693f70ba251809929b15223c5dc21cfe35a
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
@@ -122,20 +122,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+patch.8db933ca138e85d9e089edb6d824497d96ad49821c32c2b79dfe3fb5200fc59e
-#+libunwind.7406b03d5beca45b9bd7b73b83b9ff3b20a84df9f1c0d7d49ad47e8719d82c3c
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+patch.1225eb800ec6e0421d25728b71fb3e19703373425c5c4ed45ed964ac89212025
+#+libunwind.98ecf9d966402d26280e49114e6ee981430ba6c38e2f0351f0407fa96affa536
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -129,20 +129,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -1,67 +1,67 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-dosfstools.cede36089a529747add4b87d7d9fdf416216fde7c4907967f0f810072385320e
-#+busybox-e2fsprogs.0e2aa054a89ba26a1e3aea9c7cc829d0e7cda3994a2f46043d276de8bafb7094
-#+busybox-iproute2.3225ae64400729d39edaed1fb0e3d47df1e4f877b843d44f2cb92da0462e913f
-#+busybox-iputils.7447253684f7fefabcbcc87d00ce64eae8e9fbbe5f274d4e05c963ab3db8800e
-#+busybox-net-misc.446a9542cfacca71f2de0fd70b5325879ecdfe599da477adfc57aeb5f6333409
-#+busybox-net-tools.f7f7dcd270ec9abd0f79cf264194a72b14c836d04959bb5cde08ab55057ff9cb
-#+busybox-traceroute.5ca2c7b82bfb4d62f02366e36f1ccb44c68db5061844d6049a09751863d87c1e
-#+busybox-wget.1176a69ae2818c253636f82fdf95e50c593f2383834d6a0a57d4d43879a81c6b
-#+busybox-chpst.39cccdb7708209a1569b7a8db33815af5f1d61efa10252faa0b8264e7939a959
-#+busybox-console.d3b8e864dcf390b31ec11751b6df7a5f173f06bd56d983a2779f878a761a1d60
-#+busybox-getty.02d7031c17c6c72490c8e5a9438731bedf46da6cbd670a1d1c804d2ff9715105
-#+busybox-i2c-tools.a379808754de77a17c73b7509c1b1f77844cc55edc3b256a7a2af2961dff751c
-#+busybox-linux-extra.00a015bd2141b6a53c24e23d05d45da8030a99e117fe957364105901cfa7d844
-#+busybox-mtd-utils.61b8e61bac018a2391197c7ab3acf33a1b0a2d642da92eb4f2d6514953037112
-#+busybox-shadow.8c4e08bcb69931da212ba9764c71c45aeeda5d7bb297e891bc20334e3166461d
-#+busybox-su.71aa0610a3a03ef6976577585f006d3448be1e95292a39a505061e683f650344
-#+busybox-util-linux-priv.9f0b01873475e821b9c19d205d628748e0864371a8942de9ff4ed7ea43c40d1d
-#+busybox-logging.c12a39a65484f62e9500905193b3f16f1f545864d98949ed8f728bef95f93bf3
-#+busybox-cron.14f2aad53b4bc0d04e5b7e68bdd32df6edad9292c4923c1511853f688a25483d
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+nawk.6e41b318f0a7ca9942ed0565b4dd1267a29a13a400b493b4bbf5e26d76a04ebf
-#+diffutils.22606f677eb04a9c3cac724aa92d424b283d1e27c385998ee81dba0f4af7d30b
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+aat.826a87af7d74d90588859a2ee4e981b9ec7bf1ea772424c1b04c908aff760168
-#+fileset.6b072e59bc4b8a5db97440923584ee26ac5dcfe9933f9ec89b111c5c1bd47d6f
-#+rsync.32bae1f61ae7b156c8ca3da3197a4a404b97bb75a152e77b8ecb4b45b622d264
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+kbd.0462b26693600595726ac67dc80f61ca524cbaac15e092c58613cb5ddae0de8b
-#+mdevd.d20f9bfbd6215d253269a9e7790c81665db3510a9d37f866f3ba6dadf610cb2a
-#+s6-linux-utils.0a8c725b752cc3e6424cff528b790390d50e80ac89d3ed4daa66256735648633
-#+s6-rc.fa0846c1d52dece9ab323e3c2ae5c7a87e45ec4011585a4a568836b3d4f966f7
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+libcgroup.e90961e3189fba29b21c280d47bbb5b9e11b07da0729f0ebe5a009edb7a7d397
-#+system-config-scripts.d5b8d09ed532a155b52a7dbb382b1f064b7fa8a6a0a8521940ffe1baf795a16b
-#+logincaps.aba78cd58abeb220ae49f5b063d11c102f31ed6513e4540503dba26f2bab1f81
-#+busybox-modutils.8681a58e774d7e83169f3c207a24d1a8c26cad191b868c2f6d302aa560b1c877
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-dosfstools.fe9dc7453fb1a770b675108e457029a2739c6ca79627db7538ab89592669f157
+#+busybox-e2fsprogs.7259fca6189c8d0ce3f4da6dcb699a78e25fcfed78c245279c0b770dd7307700
+#+busybox-iproute2.804fa48fd6895383b3a6a27c9098e94e1a436679fc570d4a30643c52f032b3d5
+#+busybox-iputils.7e3069a6f610a281caa381c3fd7fdc205c9a333318478953385201a685bad51d
+#+busybox-net-misc.eff784f9de60c2e42d872c2ab63b7296a42dd61b824373f3b649aaeec5c3b214
+#+busybox-net-tools.fb0385bee303901604824fc18dee7e76c4582b61a9b29454cafcca0a3fd5a96c
+#+busybox-traceroute.f5e6c280aed3c3a34be0fd56898b5e9f31123c3e03a5e017c4ad009b521ed555
+#+busybox-wget.ffbfbf22ccd2b9d8d7d3d9bd5f3f6c4c9141086e580dc44faa93070370062f3d
+#+busybox-chpst.a6422550ba62ad83f199cd94bfaa1be7226cb93c9b5a6492948fd239c42e0062
+#+busybox-console.0aafd33cc9f9715ac3b15ddbac444ef9bf53e0fe74799a6c8bbfb69ccd88d3f8
+#+busybox-getty.ebe9b9d5a1f380298264d6851b0eb4c590eb4cd1fda091e78ad5f584439ec1ce
+#+busybox-i2c-tools.2f367203fde2652cb02921830bdc8884e6011f13604d87d41cda5f1044000fc7
+#+busybox-linux-extra.7bdd28daad9eb0b6e9e9fac88e9ab8c938d448e9866c9ddf6044018cedf5f401
+#+busybox-mtd-utils.c7c720c931e698ab9d591e3eea62dd911cb8f6d08fa8e30f736c3e2d9903b7e9
+#+busybox-shadow.e512b567a6c2894806767c440ae099257279aa7870d73f12038a337e63855ba5
+#+busybox-su.7781cb27b148a31fab99ab39032033c61064f1e60222a69f548a881b6a36b702
+#+busybox-util-linux-priv.d80b7538136e963ecc037e86bc4c12eb40278729b53b76fe063372361f6332ae
+#+busybox-logging.ca69ac5c243d70ede4d47c19d6207d58dbfd870d7426c773db1e2c56500a7cbe
+#+busybox-cron.93a1a158bff3b28f54c1b4178086fa55439d871677b32296404a4646fc8be2f3
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+nawk.3a4d5fc4f5da910980b1f73ac9105d3581359e75829f79ed52975a8e3eff81bb
+#+diffutils.bd9293d5e9a522517591a123da935e0cad52403e6d14842add0c4bf447fcacdd
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+aat.eb95fdd8cff549eede66a93990d8b9dd5682c49d131fa373d28d1e2d396a83da
+#+fileset.d409c0ed822b5b2c83ce61f351d3046168445548f4c2e8c556fb5203ad578a49
+#+rsync.b51eeb661953517f15c0c59f133700f3fb57b214edd0c9667ad0891427194656
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+kbd.cbb0f74237670cbd74f06eadbfc68469186bff6459b36d193166e2e892d35b4e
+#+mdevd.4154733913ff780b3108b9a5ef0604db3be2e24753361e698a5eb2909c1a7b2a
+#+s6-linux-utils.aa097f82e882ae00ab6eefe8950fa4a3e2dd28c22770205b2f805266b4588772
+#+s6-rc.b5a43df2dc3f1349fc09edb9cfd7ec25f4c9f5fba6314400c8c031edd3ee7ce9
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+libcgroup.968075cb7d13e71fd51cd7b4b5710b6ef7b8bcab0b15c2e3ba5ed69cf3675cb8
+#+system-config-scripts.a825a480ce02cb857521a750f8f2f1bde5c8518dda72c6823ab68d72f4ea67e9
+#+logincaps.6380983a04c47da978fe36b88e521c7b5f650767ff37050239fec6ef7e9ee8ff
+#+busybox-modutils.649244f8550b31e528f518bd1ab086c3d23e31d8f6ce9cf98234a61365df5016
 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config
 
 
@@ -98,8 +98,8 @@ printf '%s\n' >config/etc/skel/loginexec \
 chmod +x config/etc/skel/loginexec
 
 env 'pthbs_path_system-config'="$prefix" \
-	'pthbs_path_containers=/versions/env.893e29c4dd72978690747ca97c33bcbc6806bd1bafb2c95243b7ae6a6b33b8e9' \
-	'pthbs_path_mdevd=/versions/env.b067d86e8bd3c8f190a40151c7cfc86060a5928143d72782a924934f3c61cc6c' \
+	'pthbs_path_containers=/versions/env.6b4f190558751b742c13cd789412aa5b0b25480d489df79c1abfb64dcddcc969' \
+	'pthbs_path_mdevd=/versions/env.2be5367011f2fd91568025c37f192341425fb4715a8f6ac0b5f62dbbd7ef112b' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
@@ -150,20 +150,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -1,57 +1,57 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-dosfstools.cede36089a529747add4b87d7d9fdf416216fde7c4907967f0f810072385320e
-#+busybox-e2fsprogs.0e2aa054a89ba26a1e3aea9c7cc829d0e7cda3994a2f46043d276de8bafb7094
-#+busybox-iproute2.3225ae64400729d39edaed1fb0e3d47df1e4f877b843d44f2cb92da0462e913f
-#+busybox-iputils.7447253684f7fefabcbcc87d00ce64eae8e9fbbe5f274d4e05c963ab3db8800e
-#+busybox-net-misc.446a9542cfacca71f2de0fd70b5325879ecdfe599da477adfc57aeb5f6333409
-#+busybox-net-tools.f7f7dcd270ec9abd0f79cf264194a72b14c836d04959bb5cde08ab55057ff9cb
-#+busybox-traceroute.5ca2c7b82bfb4d62f02366e36f1ccb44c68db5061844d6049a09751863d87c1e
-#+busybox-wget.1176a69ae2818c253636f82fdf95e50c593f2383834d6a0a57d4d43879a81c6b
-#+busybox-chpst.39cccdb7708209a1569b7a8db33815af5f1d61efa10252faa0b8264e7939a959
-#+busybox-console.d3b8e864dcf390b31ec11751b6df7a5f173f06bd56d983a2779f878a761a1d60
-#+busybox-getty.02d7031c17c6c72490c8e5a9438731bedf46da6cbd670a1d1c804d2ff9715105
-#+busybox-i2c-tools.a379808754de77a17c73b7509c1b1f77844cc55edc3b256a7a2af2961dff751c
-#+busybox-linux-extra.00a015bd2141b6a53c24e23d05d45da8030a99e117fe957364105901cfa7d844
-#+busybox-mtd-utils.61b8e61bac018a2391197c7ab3acf33a1b0a2d642da92eb4f2d6514953037112
-#+busybox-shadow.8c4e08bcb69931da212ba9764c71c45aeeda5d7bb297e891bc20334e3166461d
-#+busybox-su.71aa0610a3a03ef6976577585f006d3448be1e95292a39a505061e683f650344
-#+busybox-util-linux-priv.9f0b01873475e821b9c19d205d628748e0864371a8942de9ff4ed7ea43c40d1d
-#+busybox-logging.c12a39a65484f62e9500905193b3f16f1f545864d98949ed8f728bef95f93bf3
-#+busybox-cron.14f2aad53b4bc0d04e5b7e68bdd32df6edad9292c4923c1511853f688a25483d
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+s6-rc.fa0846c1d52dece9ab323e3c2ae5c7a87e45ec4011585a4a568836b3d4f966f7
-#+s6-portable-utils.6953fd0746de15bae9194af3b9a52330124232b740c48778eb913c6be16d8359
-#+s6-linux-init.095e8972d0bd4128cb90ed1d3c5a6305041320c6be0117f792220ea550a528b3
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+system-config-rc.45de2fd03ece994fd24f864d46332b2e40cfaff1ad2f3f135a340df63de1faf9
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-dosfstools.fe9dc7453fb1a770b675108e457029a2739c6ca79627db7538ab89592669f157
+#+busybox-e2fsprogs.7259fca6189c8d0ce3f4da6dcb699a78e25fcfed78c245279c0b770dd7307700
+#+busybox-iproute2.804fa48fd6895383b3a6a27c9098e94e1a436679fc570d4a30643c52f032b3d5
+#+busybox-iputils.7e3069a6f610a281caa381c3fd7fdc205c9a333318478953385201a685bad51d
+#+busybox-net-misc.eff784f9de60c2e42d872c2ab63b7296a42dd61b824373f3b649aaeec5c3b214
+#+busybox-net-tools.fb0385bee303901604824fc18dee7e76c4582b61a9b29454cafcca0a3fd5a96c
+#+busybox-traceroute.f5e6c280aed3c3a34be0fd56898b5e9f31123c3e03a5e017c4ad009b521ed555
+#+busybox-wget.ffbfbf22ccd2b9d8d7d3d9bd5f3f6c4c9141086e580dc44faa93070370062f3d
+#+busybox-chpst.a6422550ba62ad83f199cd94bfaa1be7226cb93c9b5a6492948fd239c42e0062
+#+busybox-console.0aafd33cc9f9715ac3b15ddbac444ef9bf53e0fe74799a6c8bbfb69ccd88d3f8
+#+busybox-getty.ebe9b9d5a1f380298264d6851b0eb4c590eb4cd1fda091e78ad5f584439ec1ce
+#+busybox-i2c-tools.2f367203fde2652cb02921830bdc8884e6011f13604d87d41cda5f1044000fc7
+#+busybox-linux-extra.7bdd28daad9eb0b6e9e9fac88e9ab8c938d448e9866c9ddf6044018cedf5f401
+#+busybox-mtd-utils.c7c720c931e698ab9d591e3eea62dd911cb8f6d08fa8e30f736c3e2d9903b7e9
+#+busybox-shadow.e512b567a6c2894806767c440ae099257279aa7870d73f12038a337e63855ba5
+#+busybox-su.7781cb27b148a31fab99ab39032033c61064f1e60222a69f548a881b6a36b702
+#+busybox-util-linux-priv.d80b7538136e963ecc037e86bc4c12eb40278729b53b76fe063372361f6332ae
+#+busybox-logging.ca69ac5c243d70ede4d47c19d6207d58dbfd870d7426c773db1e2c56500a7cbe
+#+busybox-cron.93a1a158bff3b28f54c1b4178086fa55439d871677b32296404a4646fc8be2f3
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+s6-rc.b5a43df2dc3f1349fc09edb9cfd7ec25f4c9f5fba6314400c8c031edd3ee7ce9
+#+s6-portable-utils.0b60152cde5b1e8e8e439ecab2233f582e214f0c846014681b99e6d66a4cc3f5
+#+s6-linux-init.9e5e4b670dda8760392dcbb20bdd3a97114c050f1bab772d5102afd48c0766b4
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+system-config-rc.218b9e6822eb345e6949c50c610aea5be3553e4f871ccbc4fe81256e5c3f661a
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.45de2fd03ece994fd24f864d46332b2e40cfaff1ad2f3f135a340df63de1faf9/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.218b9e6822eb345e6949c50c610aea5be3553e4f871ccbc4fe81256e5c3f661a/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//versions"
@@ -193,20 +193,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+s6-rc.fa0846c1d52dece9ab323e3c2ae5c7a87e45ec4011585a4a568836b3d4f966f7
-#+fileset.6b072e59bc4b8a5db97440923584ee26ac5dcfe9933f9ec89b111c5c1bd47d6f
-#+system-config.01e6b4d359faa5eab3161fc10adf226a3e2e3786709e291fb4be320da542c1d8
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+s6-rc.b5a43df2dc3f1349fc09edb9cfd7ec25f4c9f5fba6314400c8c031edd3ee7ce9
+#+fileset.d409c0ed822b5b2c83ce61f351d3046168445548f4c2e8c556fb5203ad578a49
+#+system-config.d100fe21dcee292e769fda51de40f08bed10b2a133a4f7dffa4477daea5f1033
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.01e6b4d359faa5eab3161fc10adf226a3e2e3786709e291fb4be320da542c1d8/config/s6-rc-source
+src=/versions/system-config.d100fe21dcee292e769fda51de40f08bed10b2a133a4f7dffa4477daea5f1033/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
@@ -85,22 +85,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "vimfiles" { link($0); next }
-
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
@@ -64,20 +64,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
@@ -102,20 +102,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
@@ -68,20 +68,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -1,90 +1,90 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-dosfstools.cede36089a529747add4b87d7d9fdf416216fde7c4907967f0f810072385320e
-#+busybox-e2fsprogs.0e2aa054a89ba26a1e3aea9c7cc829d0e7cda3994a2f46043d276de8bafb7094
-#+busybox-iproute2.3225ae64400729d39edaed1fb0e3d47df1e4f877b843d44f2cb92da0462e913f
-#+busybox-iputils.7447253684f7fefabcbcc87d00ce64eae8e9fbbe5f274d4e05c963ab3db8800e
-#+busybox-net-misc.446a9542cfacca71f2de0fd70b5325879ecdfe599da477adfc57aeb5f6333409
-#+busybox-net-tools.f7f7dcd270ec9abd0f79cf264194a72b14c836d04959bb5cde08ab55057ff9cb
-#+busybox-traceroute.5ca2c7b82bfb4d62f02366e36f1ccb44c68db5061844d6049a09751863d87c1e
-#+busybox-wget.1176a69ae2818c253636f82fdf95e50c593f2383834d6a0a57d4d43879a81c6b
-#+busybox-chpst.39cccdb7708209a1569b7a8db33815af5f1d61efa10252faa0b8264e7939a959
-#+busybox-console.d3b8e864dcf390b31ec11751b6df7a5f173f06bd56d983a2779f878a761a1d60
-#+busybox-getty.02d7031c17c6c72490c8e5a9438731bedf46da6cbd670a1d1c804d2ff9715105
-#+busybox-i2c-tools.a379808754de77a17c73b7509c1b1f77844cc55edc3b256a7a2af2961dff751c
-#+busybox-linux-extra.00a015bd2141b6a53c24e23d05d45da8030a99e117fe957364105901cfa7d844
-#+busybox-mtd-utils.61b8e61bac018a2391197c7ab3acf33a1b0a2d642da92eb4f2d6514953037112
-#+busybox-shadow.8c4e08bcb69931da212ba9764c71c45aeeda5d7bb297e891bc20334e3166461d
-#+busybox-su.71aa0610a3a03ef6976577585f006d3448be1e95292a39a505061e683f650344
-#+busybox-util-linux-priv.9f0b01873475e821b9c19d205d628748e0864371a8942de9ff4ed7ea43c40d1d
-#+busybox-logging.c12a39a65484f62e9500905193b3f16f1f545864d98949ed8f728bef95f93bf3
-#+busybox-cron.14f2aad53b4bc0d04e5b7e68bdd32df6edad9292c4923c1511853f688a25483d
-#+attr.5355db75f87a68c1ac16698301dc4f867698ee419ed694db587e5b963b19e37e
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+diffutils.22606f677eb04a9c3cac724aa92d424b283d1e27c385998ee81dba0f4af7d30b
-#+patch.8db933ca138e85d9e089edb6d824497d96ad49821c32c2b79dfe3fb5200fc59e
-#+flex.5aacea292611a322b9d0faa2d50c8a8e5af41b0e70ae5f0c9ec72bb5c80f59cc
-#+bison.fb825f649759d3c0a4da1e06d237e4da1972cc5eddab72db60ef6ce192e7be16
-#+rsync.32bae1f61ae7b156c8ca3da3197a4a404b97bb75a152e77b8ecb4b45b622d264
-#+execline.4cd4705ef00ee2d0ee6b37643b4b2581c60ac2114dd6014063bfa3c3a7f6a630
-#+s6.0e633818f5486c47f95971610ccd76b3f5c63f4acaf32863448aaacb5a81df89
-#+s6-rc.fa0846c1d52dece9ab323e3c2ae5c7a87e45ec4011585a4a568836b3d4f966f7
-#+s6-portable-utils.6953fd0746de15bae9194af3b9a52330124232b740c48778eb913c6be16d8359
-#+s6-linux-utils.0a8c725b752cc3e6424cff528b790390d50e80ac89d3ed4daa66256735648633
-#+s6-linux-init.095e8972d0bd4128cb90ed1d3c5a6305041320c6be0117f792220ea550a528b3
-#+mdevd.d20f9bfbd6215d253269a9e7790c81665db3510a9d37f866f3ba6dadf610cb2a
-#+s6-dns.5c109299797cc215d8ef491dfe9c58ddfcaf3fd8d350a8acfbaf851a9f904c0c
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
-#+s6-networking.d62b66c213de419795e6c3e1638e04a6504fb155a405c1d40786c5dc07da0905
-#+zsh.f6ffa94f4d7364858d356c2079d5524a05216e11c4de6e184f7f7855f4d11f16
-#+pthbs-banginstall.15e36bd45c63e17076a528fe131076ddcf6c4bfa6e3f2e67070f0489e4bc9eaa
-#+aat.826a87af7d74d90588859a2ee4e981b9ec7bf1ea772424c1b04c908aff760168
-#+confz.76aadf1eaa041da7e5a4bf67db25edee947c8390482a6be851a812f3a4f675cb
-#+containers.d61ff0662b2231f7ca2cff52b0722fce4413b338fb33ea45b94f796b223cdb91
-#+fileset.6b072e59bc4b8a5db97440923584ee26ac5dcfe9933f9ec89b111c5c1bd47d6f
-#+logincaps.aba78cd58abeb220ae49f5b063d11c102f31ed6513e4540503dba26f2bab1f81
-#+snaprep.4fd031deb15f24e43605e231116e55745e2815e07fec96bf2403e1cfd2ed2372
-#+curl.72d004aec91307eba1bcf1146984da632d0a13aee912aa15c2a69349fe053229
-#+git.b05632b64247b7a69a7b8fcc5c9ff04c046b15ba896e47bf7923dad04cf0fc9e
-#+xbps.f488762f51b6c901c0cef990385cd1fc90fade5a9c183723a4fa0c8a42f88dbd
-#+apk-tools.8c27ad371e248cd9a9b0a538f3a184b9c631fa2f2c534e56d91ca4f33c535d72
-#+getent.999e76717e1c18fbf17c2c31c79853c58ad9c1e021d1f9e02e357f183ee8c5c6
-#+getconf.a93f4d61808cb447bfaa885fda7fbf26b843e013bd4566494e2b033f9039585b
-#+iconv.4764dc2e7faf897c268c445f4d25f8233cc9ef95df890e2f271f69da5abe342f
-#+libcap.683f862a53bb1c8c43ddac06a3eb19cee36a6358907a83da8bfaa6cfd57b1ae0
-#+applyuidgid-caps.ae1bdf662aca9ac8aa82c3b74d1fb96260581070b4688f8a0702b1f85ef7f1d2
-#+ccx-utils.6e5508cb77192421cebdf59415d0d277d6d39e38e5fae832100f7c3642d2c274
-#+user-env.eb3cd5a1960689967dee0cec2f172f50286bab038569c5a902d2ed99f357e655
-#+strace.74b29183068f2fcea618d6cbea430e2eef2a570576fcef54d4f8d900a46ff886
-#+mlog.f93b41a0144c38ee34e54f6b6659a1df8c2b208dfd575d8fc472fd9f52fe425f
-#+findutils.f2299ef188fec38248caf926579b05887d354deb57caaa8cd20f3d45ad6e06b7
-#+nawk.6e41b318f0a7ca9942ed0565b4dd1267a29a13a400b493b4bbf5e26d76a04ebf
-#+squashfs-tools.5f619beafa5635e04890e0ae9f89d1e531d2594848403c0adabce5ed5324d016
-#+mandoc.d04de8e1e8df0a619fe06b7739adadc7480455bccb116af08cba3023e0e8305f
-#+tinyssh.d92ac5a6d8d0ecdd6d3da3c7c2ec82d255c138c9c41a7e50a948d355e3d8e2d2-
\ No newline at end of file
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-dosfstools.fe9dc7453fb1a770b675108e457029a2739c6ca79627db7538ab89592669f157
+#+busybox-e2fsprogs.7259fca6189c8d0ce3f4da6dcb699a78e25fcfed78c245279c0b770dd7307700
+#+busybox-iproute2.804fa48fd6895383b3a6a27c9098e94e1a436679fc570d4a30643c52f032b3d5
+#+busybox-iputils.7e3069a6f610a281caa381c3fd7fdc205c9a333318478953385201a685bad51d
+#+busybox-net-misc.eff784f9de60c2e42d872c2ab63b7296a42dd61b824373f3b649aaeec5c3b214
+#+busybox-net-tools.fb0385bee303901604824fc18dee7e76c4582b61a9b29454cafcca0a3fd5a96c
+#+busybox-traceroute.f5e6c280aed3c3a34be0fd56898b5e9f31123c3e03a5e017c4ad009b521ed555
+#+busybox-wget.ffbfbf22ccd2b9d8d7d3d9bd5f3f6c4c9141086e580dc44faa93070370062f3d
+#+busybox-chpst.a6422550ba62ad83f199cd94bfaa1be7226cb93c9b5a6492948fd239c42e0062
+#+busybox-console.0aafd33cc9f9715ac3b15ddbac444ef9bf53e0fe74799a6c8bbfb69ccd88d3f8
+#+busybox-getty.ebe9b9d5a1f380298264d6851b0eb4c590eb4cd1fda091e78ad5f584439ec1ce
+#+busybox-i2c-tools.2f367203fde2652cb02921830bdc8884e6011f13604d87d41cda5f1044000fc7
+#+busybox-linux-extra.7bdd28daad9eb0b6e9e9fac88e9ab8c938d448e9866c9ddf6044018cedf5f401
+#+busybox-mtd-utils.c7c720c931e698ab9d591e3eea62dd911cb8f6d08fa8e30f736c3e2d9903b7e9
+#+busybox-shadow.e512b567a6c2894806767c440ae099257279aa7870d73f12038a337e63855ba5
+#+busybox-su.7781cb27b148a31fab99ab39032033c61064f1e60222a69f548a881b6a36b702
+#+busybox-util-linux-priv.d80b7538136e963ecc037e86bc4c12eb40278729b53b76fe063372361f6332ae
+#+busybox-logging.ca69ac5c243d70ede4d47c19d6207d58dbfd870d7426c773db1e2c56500a7cbe
+#+busybox-cron.93a1a158bff3b28f54c1b4178086fa55439d871677b32296404a4646fc8be2f3
+#+attr.51e6d376dae2a666eb579f95fba5a46209b70a50068ab5ef136c8aa02a3e02db
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+diffutils.bd9293d5e9a522517591a123da935e0cad52403e6d14842add0c4bf447fcacdd
+#+patch.1225eb800ec6e0421d25728b71fb3e19703373425c5c4ed45ed964ac89212025
+#+flex.a0ca1afbde90c6494bcc4dc039ac1892034358d4fc6c590de40df83f32966126
+#+bison.3cab4d70f4a22a21c792df2e75e4b90d91636cdc95e0585d8e49ec2ae8104bbd
+#+rsync.b51eeb661953517f15c0c59f133700f3fb57b214edd0c9667ad0891427194656
+#+execline.aacd8e3ceece70f15d43e076bc07caa871a626e3a03556c7d6631646e53f4d15
+#+s6.550e301dc6dfcf26db08026d00c860a304b8a66185f9505cceecfde447a91729
+#+s6-rc.b5a43df2dc3f1349fc09edb9cfd7ec25f4c9f5fba6314400c8c031edd3ee7ce9
+#+s6-portable-utils.0b60152cde5b1e8e8e439ecab2233f582e214f0c846014681b99e6d66a4cc3f5
+#+s6-linux-utils.aa097f82e882ae00ab6eefe8950fa4a3e2dd28c22770205b2f805266b4588772
+#+s6-linux-init.9e5e4b670dda8760392dcbb20bdd3a97114c050f1bab772d5102afd48c0766b4
+#+mdevd.4154733913ff780b3108b9a5ef0604db3be2e24753361e698a5eb2909c1a7b2a
+#+s6-dns.67acdccf5a6475315dca3557e28a059d5b3a6e3decb28f9fec04ce1a187104d9
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
+#+s6-networking.c4443af7974fc56303e1f5d7e17ebe4a1f7b4d9fd1a941f8d4e408d1398277df
+#+zsh.e70e877a9f9edc997affe824ed6f88424223ef3a8c46879b2a31428af8a8613c
+#+pthbs-banginstall.efbba02ac5305ac1b4b06c882d2f6a56f61720fa7034f0a2fe1dee77cdb2756d
+#+aat.eb95fdd8cff549eede66a93990d8b9dd5682c49d131fa373d28d1e2d396a83da
+#+confz.976e2e5eca44f9e2f3aa156dbac5550950205e2074ddd5a2182f51f962de20ab
+#+containers.15e85b61935af2e77d7f958996f6df6455b6a5cd79a31026d0cb91b559aa4920
+#+fileset.d409c0ed822b5b2c83ce61f351d3046168445548f4c2e8c556fb5203ad578a49
+#+logincaps.6380983a04c47da978fe36b88e521c7b5f650767ff37050239fec6ef7e9ee8ff
+#+snaprep.1d83e4af0a7250113b4c28a48d5156e6cb3058123c14c7f24e5c54019097a41b
+#+curl.455a5468933be7168f5e430072b8c9797aa445d106edadbacb5d23be94e8345a
+#+git.b9176788309f592a4a9403f55b46648f54ceeb6ebcf4ca21701294d2d62d9237
+#+xbps.797b022f57edff25bf117f64ae104092e0e1d2bcff17848b6f66df6513bf9c7a
+#+apk-tools.a22aea46546549aa4b3da4621ef54c77d2e646765fb6424e44cf884f15513f30
+#+getent.8a0c3b9665c430990fecc07f769f33a2355e796e1e19408fb5d226952d67ac95
+#+getconf.a7eca343623c7e4c27e636a93d51045c4ee43efd673c751e89cd76c193e5d4cc
+#+iconv.7f3e7aa47b62d05f22800899d9d3d856a2981c823e473bf6a198a8657885dd2b
+#+libcap.7bbb6a623d348970799e44e4552e5ccff8f43619187ce9d2c527ab2f74619d31
+#+applyuidgid-caps.bdd29d106820b66373e56e8c94e16755aacbae3475d21f4911deaa38b04795fc
+#+ccx-utils.b26547dc8a2b883ec4c46581151c3173c1b5e43d55b79081366754db05f6d777
+#+user-env.e7a492ded2a3cfe5997fe9164e39f769e9f90bb3c01f724729109923de6d4410
+#+strace.9c21a3cc83395beea41e216d0d56782e23982d85812983ac7526859281bf5d52
+#+mlog.76ed22dee95284d8874841b434c8b8ee5aff5d55cbcba56d3224c416bb7af3b3
+#+findutils.6098c312e4bc7e3b5737a2aef7eb3e5b3cdd729df8f2521b16d2119b79546cec
+#+nawk.3a4d5fc4f5da910980b1f73ac9105d3581359e75829f79ed52975a8e3eff81bb
+#+squashfs-tools.b9e99cc58c811c8033edbeb9db0a21acab2a667b0206e100d7e1b5411e31afd5
+#+mandoc.a3ca9919c5bc957261e76ff427fcef1d9a907d8731065fe1449bb6b72a3bea8e
+#+tinyssh.07da814b366eba0d215407d04434309f11728aba1ead68aa68511de582016f43+
\ No newline at end of file
diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment
@@ -1,2 +1,2 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.0838629d8c52ba74914ad5f0cf130234849d06bebb779f5fb22376e064866c01-
\ No newline at end of file
+#+linux-qemu-guest.1cd1f9bc17dd15329a02d668d3c331cbd3d4ff0352d60dcd07eb2b9039aeb386+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+libarchive.8758f6aa9e71e0b4b043a4b19d99986f3647995e101548af3a71425f20118eb4
-#+libressl.217ff861d492291330d7b7d1fb4396695addb9aedcdc006f0d49d490b6120351
-#+pkgconf-pkg-config.27bd89d2a71510509379204444af2af18e3d1f55c16e7b0190fa1f05ee50d029
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+libarchive.dd10706696d6f25a8e15bf1f4889ea14720701e72d8363bb2c348c9a0f5ebbd2
+#+libressl.ec7a63a3249c86932b3a516769d6dcf133900580b35aabce7c5b4d9e490036ca
+#+pkgconf-pkg-config.0cad8e56f082b98336c9640c2415c9ddc2f2b6e0426b3f64b7210af40ff06855
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
@@ -127,20 +127,29 @@ $1!="."{exit 1}
 
 $2 == "keys" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+m4.0cbc7ffae8beca3eb61a6bbc1c9379a978ba4f8858def50e4fb4ccf2d67005a5
-#+netbsd-curses.bb57795aea8fc3b593b6b1bfa205481dca8a4fc778833863dcd6f85bf04644bf
-#+libbsd.eb7c51b0a63bda00444ba22490c3c0ca84a07840ab9cab54619f469e9f7fed29
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+m4.0e264bd7e38ad5550d17da30402e67f9ac3f5ca2e93b2560b583ddf0b5341a9a
+#+netbsd-curses.ed23772837f681ce0b2fcb8e64a00516f4ee958f9e546c4dc2a71dcffb0d99ec
+#+libbsd.936433baa586f97cb455589a778f22f7d62316e77041ec32cfc27932f4d6a96c
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -163,20 +163,29 @@ $1!="."{exit 1}
 $2 == "zsh" { link($0); next }
 $2 == ".env-template" { link($0); next }
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.20e66af21fbde98f00fc5eed6bd24a6b90733658c1ee526ad0e54ae130193f96
-#+busybox-bzip2.6a0291a3dc3d51b4550b877aa467f45621b4dd58fa3ec95547daf3c98c9c9838
-#+busybox-gzip.4e3e00cbc8a0fbeb79034bb94697543c83e7041536d857490a00b5d48c841789
-#+busybox-lzop.eba25299fcb6ac298a8dd71b33a5a5af29f1294cb62ac02dec509abf5a72af67
-#+busybox-unzip.0426fff438e38962a3a5244b664024f1a3bd6b2d692331f048738713ba96bff9
-#+busybox-xz.4e93f2c8c22a5d6c3ff41cd048f0faa0977709203b886214f80700e354adea8a
-#+busybox-cpio.e8bbf946cad3d302fc3e4ae6dcd3d825c51644bff2964e0ea47269c53be7e588
-#+busybox-dpkg.5670e411176e87f6ba9a5f5c1a4d83238482b28a02c15c4be44b60c6cf5f63fa
-#+busybox-rpm.7a698a7f82744703f97d07eafe6f838b0e694ee4b8cdaba6a6285699febd41f6
-#+busybox-tar.4eb4e810115788472686bd34d1dc0a66f21bd670e26d716cccd5f97ce372e7cd
-#+busybox-ed.f6f0c6a755b2263f895562a156eb3ae1f037725a22c00e51c89c71d5f4a27528
-#+busybox-sed.5c8ec49d3250e138754447f5202f5105deb6e198480d3ac4a64ad685d24f70b3
-#+busybox-vi.11879a7b769a97633d884b31211ead314ca5687f058f1b53341376a5a87bc2a0
-#+busybox-xxd.57e67ea54619074d743511d5a0d6c91c9c76b5e9729fed78df7b9ed277f75056
-#+busybox-process-extra.fc8a9d8f024677be2e071b7e9702c2627bd90a91ca4686ab2245c2983b2b6ad2
-#+busybox-procps.dfabae9992bcd4578108e1a24d3cafbdb91cf51c3032b8bdd1f0a84cb06d6d0f
-#+busybox-psmisc.b558986e7452cabf851ecaecdf7769223167c7685cf974de64b035abc84c0c4b
-#+busybox-ash.6fc26bdae2e5cff2b539e3654ef1de8ac69b12a4e0e377ce5696d318e5ea7e46
-#+busybox-bc.008a751d3e3ff7fe4ba8d26606b1a9eaabbc3f27c7f5b00a1ce31f4b0a379774
-#+busybox-coreutils.940cb857a41b427f03077a9bdb63f287a7f2b8dc765bb52236b9bf98b88da5dd
-#+busybox-coreutils-extra.e2169744584aca436f4c87bab590d080f9d4003d528c816a68c0ba4c23bc9b8e
-#+busybox-daemontools.768a99943141defa99593c9a7e54c5eaf3a28c45b7e4ff0cdc629d1f343b9199
-#+busybox-grep.7a4bebb03dfab3e54b91c5991c60f04cdd398deeaf9b1878ae114baf19170017
-#+busybox-misc.f52ae1e404ed4b8c0ee3e55228fe8b4744cc92097b8de8867a6ec7b1fd625e5a
-#+busybox-sh.202305a6ef50ac874c29dfed43d6390ecb9dc3d90e4d094c26e012f1f9f50688
-#+busybox-util-linux-unpriv.d679cf5ae31fde376a06aaa4876d4f840bdb473c3d12b36c8d26ad21c95842d1
-#+busybox-findutils.21f6c191c3dfbf1e60a3edd902ef996f03994ec336dea6e5d0e7b065fd80f590
-#+busybox-awk.75c060cd1646721ba4213d738fbe9445767057dfd74ca9d160682eeeb12178d3
-#+musl-cross-make.de58f7790a489626502ea6ec82f5e3e68c0768ec3a2f94c8b195b42df8da0b56
-#+gnu-make.8e0e3b821f6461d6c0e26c25991779961ed98de5060cc0167cf6e08ec5ef1023
-#+busybox-diffutils.24359cb5755302648765c8b87234cb4e184e013ef0cd32ea5081ccaac3807244
+#+busybox.4e878cf357f11a7b5ba40d5194835f901ef48d7043daceb3c10ff47466e4d842
+#+busybox-bzip2.17e18d5955c7f21a900407c7e8ac37ff1ee37292c3bbf1f07d6943c58527c916
+#+busybox-gzip.134f9a4c9e8c75476d8aeb4843d92ccba2484ddc07d5bcebfbb242c41fa0372b
+#+busybox-lzop.4821aa021173a48518e8268cf9703727d985ac27f5fbc1dfba8a54f3caa1299e
+#+busybox-unzip.701c1303a391b3887d21e22f06031e3731f32e29f6de572a256be373be481491
+#+busybox-xz.6cfdf7c72be96e5c2fac347166a34205684f4e5de848c603726b7ddc566bfa7f
+#+busybox-cpio.08ca153c02a65fb82f8e323413b8e2a67303cbbf0692fe94b09c82786a2f67d3
+#+busybox-dpkg.3ddb4c803c0bdded104cba179d9acc6235d6230255db289b4906847ae036334d
+#+busybox-rpm.9673450ba9926a361df3bd4d646fc72bbc1c5ed788739af8d5bebd9ca5577c24
+#+busybox-tar.118feb66cb667edcda39e3d07f04e99f30f16bc5e249efc282ab7de29aeb2e7f
+#+busybox-ed.7be2a8154d8fa4ac5dc6d7e1378212629966b3a7ecfa2d9da7c1f2f2462afe0b
+#+busybox-sed.5f60dc6cf8505a96974afd9ecd04a08dcebaac4ba62f32d10e58e5986c0aa6b3
+#+busybox-vi.9d086e0a713890f0e95c1ebfde842ce4b606902351495f5a54d4ca2c1f4727c6
+#+busybox-xxd.b8060a13923cdbd6d1b8ff01c558a0d6263631731441cd2cda596f3f81613bc2
+#+busybox-process-extra.37e05f4aafc2f0538340ebe37689b930493ecbdbdfe1ac8e225b610636f9dcfd
+#+busybox-procps.3f754110b495bf11ea9350c60b9babce09887b54d7ea5dbf9066ee24a8ff8236
+#+busybox-psmisc.44e8a30e1d1b233c3ca389bd1e31a984f5ebfc2edcef11ad1eb5495122a1c744
+#+busybox-ash.4354c0e572173bd74229008308d5fbfaf426c6f0029d3e1fc223088f577461d0
+#+busybox-bc.be0d795fd6ca6190cf7bfc7b2961b4d4c9e1e44b547d18423f6f189df1051905
+#+busybox-coreutils.3434bf7336ac2c6cf21502280a21ad01853ba7618128ddd582d6f46b45a9b075
+#+busybox-coreutils-extra.cfb652fe02284c6655b7bd8eb03f3f32a5b7139217661aacb70ff106dd9060a3
+#+busybox-daemontools.b54e2e6c209b2976237d5d0438c68eb54869486eeb7aa16589be05ba9d42dc96
+#+busybox-grep.d594914a95394a2c3ded23a7c1500449d6b87fbff9dcc2fc3b60d51976f26dd7
+#+busybox-misc.43773365ec589decf7007b5d915678cfbfdcfa416befb80c843314ed9d416106
+#+busybox-sh.efcaa2032afd17d1f4a6a3d2c7ca5dc08b179cb862a5733046c2bfb22c9fbe5e
+#+busybox-util-linux-unpriv.1129ef897da5b29169657b066f9a86b63e3d36a24f33e59863aa5742807a6c0e
+#+busybox-findutils.44f49a6150fb9c551d2546c27261060b01a7b3a18080666b039bb6007a18cf91
+#+busybox-awk.e8a68bc8fcf7d87e1b8dafb18f08b42b42c5f8f09f30961669df38037651a681
+#+musl-cross-make.8cff65996d3783038b60373628df3971c541e83230d164ac06d29687deb0bcfb
+#+gnu-make.31f1e476d479827044816e2cdc69a298d84b3a7e170933a0db3fbaee527af314
+#+busybox-diffutils.541027d44406106cfe3ddbfb5df26d8a47d6c2aab567b1e30775fff649ea83e7
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
@@ -100,20 +100,29 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "config" { link($0); next }
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
 $2 == "env" { link($0); next }
+$2 == ".env-template" { link($0); next }
+
+$2 == "command" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
+$2 == "sbin" { link(s1("command", $0)); next }
 
 $2 == "library.so" { link($0); next }
 $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
+$2 == "library.ocaml" { link($0); next }
 
-$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
 
+$2 == "config" { link($0); next }
+$2 == "keys" { link($0); next }
+$2 == "zsh" { link($0); next }
+$2 == "vimfiles" { link($0); next }
 $2 == "man" { link($0); next }
 $2 == "info" { link($0); next }
 $2 == "doc" { link($0); next }