pthbs

commit 150966ec894b3661f64b7c6548d74b8d832f711c
parent 911405b6d1b32bd9c809905a5d98b16b008fc848
Author: ccx <ccx@te2000.cz>
Date:   Tue, 27 Feb 2024 00:57:44 +0000

link zsh functions from scriptsetup correctly

Diffstat:
M
command/pthbs-enter-gen
 | 
4
++++
M
packages/aat
 | 
5
+++--
M
packages/confz
 | 
5
+++--
M
packages/containers
 | 
5
+++--
M
packages/core-system-conf
 | 
4
++--
M
packages/core-system-init
 | 
4
++--
M
packages/core-system-rc
 | 
6
+++---
M
packages/core-system-scripts
 | 
5
+++--
M
packages/default.environment
 | 
22
+++++++++++-----------
M
packages/fileset
 | 
5
+++--
M
packages/logincaps
 | 
5
+++--
M
packages/snaprep
 | 
5
+++--
M
packages/userspace.environment
 | 
12
++++++------
M
templates/scriptsetup
 | 
5
+++--

14 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/command/pthbs-enter-gen b/command/pthbs-enter-gen
@@ -1,4 +1,5 @@
 #!/bin/sh -e
+
 if test $# != 1; then
 	printf >2 'usage: %s\n' "pthbs-enter-gen /path/to/env.hash"
 	printf >2 'Error: expected 1 argument, got%s\n' "$#"
@@ -21,6 +22,9 @@ if ! test -d "$envcommand"; then
 fi
 mkdir -p "$envdir"
 printf '%s\n' "$envcommand" >"$envdir/PATH"
+if test -d "$envtop/zsh"; then
+	printf '%s\n' "$envtop/zsh/site-functions:$envtop/zsh/functions" >"$envdir/FPATH"
+fi
 
 if test -x "$envcommand/execlineb" && test -x "$envcommand/s6-envdir"; then
 	cat >"$exe" <<EOF
diff --git a/packages/aat b/packages/aat
@@ -22,7 +22,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 mv -v data.awk "$pkgdir/"
 
@@ -48,7 +49,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
diff --git a/packages/confz b/packages/confz
@@ -22,7 +22,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 
 cd "$pthbs_destdir/versions/$pthbs_package"
@@ -46,7 +47,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
diff --git a/packages/containers b/packages/containers
@@ -23,7 +23,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 
 cd "$pthbs_destdir/versions/$pthbs_package"
@@ -50,7 +51,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -2,8 +2,8 @@
 #+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd
 #+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77
-#+aat.3755b6e4a470de8a2a513edc2acc19850cf61686fc29eee5b2b19eb017537055
-#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
+#+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69
+#+fileset.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
 #@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf
 
 : ${JOBS:=1}
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -5,9 +5,9 @@
 #+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f
 #+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576
 #+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403
-#+core-system-rc.234a637acbc3636c8bc014f4c5e6ff827b3306bee66437b3e8e163a7d0ba2637
+#+core-system-rc.56833ddc76163f55e3a9b5057e2e8333b03529d40d5a82d516d0cf7bc0fad35e
 
-s6rcdb=/versions/core-system-rc.234a637acbc3636c8bc014f4c5e6ff827b3306bee66437b3e8e163a7d0ba2637/s6-rc-db
+s6rcdb=/versions/core-system-rc.56833ddc76163f55e3a9b5057e2e8333b03529d40d5a82d516d0cf7bc0fad35e/s6-rc-db
 prefix=/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -2,10 +2,10 @@
 #+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b
 #+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423
 #+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04
-#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
-#+core-system-conf.be2d03329f9df3a613d4eb90fa9896cd7cc27ee9405aac5cd9e30ea2286105d7
+#+fileset.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
+#+core-system-conf.9697f29d331e0ea50101e42f176c0d2db6387292559b079c2a8bdf8431a25716
 
-conf=/versions/core-system-conf.be2d03329f9df3a613d4eb90fa9896cd7cc27ee9405aac5cd9e30ea2286105d7/core-system-conf
+conf=/versions/core-system-conf.9697f29d331e0ea50101e42f176c0d2db6387292559b079c2a8bdf8431a25716/core-system-conf
 prefix=/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/core-system-scripts b/packages/core-system-scripts
@@ -22,7 +22,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 
 cd "$pthbs_destdir/versions/$pthbs_package"
@@ -47,7 +48,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
diff --git a/packages/default.environment b/packages/default.environment
@@ -18,16 +18,16 @@
 #+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee
 #+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
 #+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
-#+aat.3755b6e4a470de8a2a513edc2acc19850cf61686fc29eee5b2b19eb017537055
-#+confz.d5eb5a104bf41e55404021581654a18d25c5e8640497466344b90f7c9ac5ebd9
-#+containers.3054ec7c0031b57c78ecb3772939d7c6583215a4ee531839a4a43207cf56c13f
-#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
-#+logincaps.627f74c39489a69ac09eda17c226e0a7f2f23dbd96fc28c43509cb43fbef45e8
-#+snaprep.ee69abcfc934bf80914a0110b77f0a30992bccdab92559dbbae7ca1f599f0ae7
+#+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69
+#+confz.d494f10b651c49ab09a9759710c3998adb568b50a5512bf116119bf906c3b07d
+#+containers.89dbab49932aced8f0977728839ad737649360739b0551e8755966801f26cd09
+#+fileset.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
+#+logincaps.5f7ebf75103348236fbc1f50a7085e448c3a59e3ad92be1ccceb81dea976e4df
+#+snaprep.dba09cb13b0367665897131b2fdf9deba65ea321dc2fc8e30a1dbe57fd794d8d
 #+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
 #+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9
 #+linux.c5fe89bcf8fcccecb1d966791fc3fdf15cce0225905b6421064a25d5a961ddb4
-#+core-system-conf.be2d03329f9df3a613d4eb90fa9896cd7cc27ee9405aac5cd9e30ea2286105d7
-#+core-system-rc.234a637acbc3636c8bc014f4c5e6ff827b3306bee66437b3e8e163a7d0ba2637
-#+core-system-scripts.b7fda104b06e30b612a2c5fb72e6da9c9fb94c70ac3ad75dc213a8f6f79df706
-#+core-system-init.a5291a86711164b991cb91d266f59f382e7d3d49e40e95eb849b12bd4ae350bd-
\ No newline at end of file
+#+core-system-conf.9697f29d331e0ea50101e42f176c0d2db6387292559b079c2a8bdf8431a25716
+#+core-system-rc.56833ddc76163f55e3a9b5057e2e8333b03529d40d5a82d516d0cf7bc0fad35e
+#+core-system-scripts.ee523efb83b205613798c4b7b55b7553201a688a256cc685087e31c750c69f1c
+#+core-system-init.79b95068031a7cf14ca64c82219867cb37ecef0eaabfc7fe40dcd75ec7beaf9d+
\ No newline at end of file
diff --git a/packages/fileset b/packages/fileset
@@ -22,7 +22,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 
 cd "$pthbs_destdir/versions/$pthbs_package"
@@ -48,7 +49,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
diff --git a/packages/logincaps b/packages/logincaps
@@ -24,7 +24,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 cd login
 sh build_static.sh
@@ -53,7 +54,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
diff --git a/packages/snaprep b/packages/snaprep
@@ -22,7 +22,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 
 cd "$pthbs_destdir/versions/$pthbs_package"
@@ -47,7 +48,7 @@ function link(src) {
 $1!="."{exit 1}
 
 
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 $2 == "command" { link($0); next }
 $2 == "bin" { link(s1("command", $0)); next }
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -18,11 +18,11 @@
 #+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee
 #+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89
 #+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a
-#+aat.3755b6e4a470de8a2a513edc2acc19850cf61686fc29eee5b2b19eb017537055
-#+confz.d5eb5a104bf41e55404021581654a18d25c5e8640497466344b90f7c9ac5ebd9
-#+containers.3054ec7c0031b57c78ecb3772939d7c6583215a4ee531839a4a43207cf56c13f
-#+fileset.7f6a6b2ec33161bfccb65a4bc5da89ba5554e90267cd88c836b37aa9ee8a3815
-#+logincaps.627f74c39489a69ac09eda17c226e0a7f2f23dbd96fc28c43509cb43fbef45e8
-#+snaprep.ee69abcfc934bf80914a0110b77f0a30992bccdab92559dbbae7ca1f599f0ae7
+#+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69
+#+confz.d494f10b651c49ab09a9759710c3998adb568b50a5512bf116119bf906c3b07d
+#+containers.89dbab49932aced8f0977728839ad737649360739b0551e8755966801f26cd09
+#+fileset.a3906d61697609cb9fb9a093f0c94078edba4097da0fa342ba1e9b1cd493003d
+#+logincaps.5f7ebf75103348236fbc1f50a7085e448c3a59e3ad92be1ccceb81dea976e4df
+#+snaprep.dba09cb13b0367665897131b2fdf9deba65ea321dc2fc8e30a1dbe57fd794d8d
 #+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec
 #+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9 
\ No newline at end of file
diff --git a/templates/scriptsetup b/templates/scriptsetup
@@ -25,7 +25,8 @@ if test -d vim; then
 fi
 
 if test -d zsh-functions; then
-	mv -v zsh-functions "$pkgdir/"
+	mkdir -p "$pkgdir/zsh"
+	mv -v zsh-functions "$pkgdir/zsh/site-functions"
 fi
 
 {%- block extra_script %}
@@ -34,6 +35,6 @@ fi
 {% block rules %}
 {%- block extra_rules %}
 {%- endblock %}
-$2 == "zsh-scripts" { link($0); next }
+$2 == "zsh" { link($0); next }
 $2 == "vimfiles" { link($0); next }
 {% endblock -%}