mrrl

commit a456b546d931da471a8367da0e823eb670e6d2a0
parent 7d8bbd2b8dc64e3da0bfc18c9d1c11b00414440c
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Fri, 23 Feb 2024 18:38:18 +0100

Fix path convention for environments

Diffstat:
M
packages/default.environment
 | 
2
+-
M
packages/pthbs-enter
 | 
2
+-
M
packages/userspace.environment
 | 
2
+-
M
templates/pkg/pthbs-enter
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/default.environment b/packages/default.environment
@@ -18,7 +18,7 @@
 #+s6-networking.d30d0310f70a9af097cc2d98e7a97e329a626b005cb0b49247ce6cdaec251956
 #+zsh.841d7010e0fe14991eb6173c03fd35eecda23c9693da65d121af20615e0dc5a0
 #+pthbs-banginstall.849e1bc924bc7d9eff0c2ce1c3a44bf38afbf6b2a5f1dfbea7c077f886646e7b
-#+pthbs-enter.b6e9f4cb7524c9f93f66a71a63373fb63bd0d97d4a79d70ad4266d429badfe49
+#+pthbs-enter.617fabb2aaebc216063b2b774b8ad58d8ca7023847bbe638dffd4fc2e41df5f0
 #+aat.9da7c8dd0936f2dcfd534a0473da1b730e29946cdd4db133659a1a35f0b53144
 #+confz.4d0086594f647e7ab869714ca88253442d1b40f5f66312579521708a9e7cf24e
 #+containers.b5344393dbacc75ea943cf9119959cad0fc7c7272f7760b99ca67f3d48f7cf09
diff --git a/packages/pthbs-enter b/packages/pthbs-enter
@@ -5,7 +5,7 @@
 
 envpath=${PATH%%:*}
 case "$envpath" in
-	(*.env/command) ;;
+	(*/env.*/command) ;;
 	(*)
 		printf "Error: '%s' doesn't look like environment path!\n" "$envpath"
 		printf "PATH='%s'\n" "$PATH"
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -18,7 +18,7 @@
 #+s6-networking.d30d0310f70a9af097cc2d98e7a97e329a626b005cb0b49247ce6cdaec251956
 #+zsh.841d7010e0fe14991eb6173c03fd35eecda23c9693da65d121af20615e0dc5a0
 #+pthbs-banginstall.849e1bc924bc7d9eff0c2ce1c3a44bf38afbf6b2a5f1dfbea7c077f886646e7b
-#+pthbs-enter.b6e9f4cb7524c9f93f66a71a63373fb63bd0d97d4a79d70ad4266d429badfe49
+#+pthbs-enter.617fabb2aaebc216063b2b774b8ad58d8ca7023847bbe638dffd4fc2e41df5f0
 #+aat.9da7c8dd0936f2dcfd534a0473da1b730e29946cdd4db133659a1a35f0b53144
 #+confz.4d0086594f647e7ab869714ca88253442d1b40f5f66312579521708a9e7cf24e
 #+containers.b5344393dbacc75ea943cf9119959cad0fc7c7272f7760b99ca67f3d48f7cf09
diff --git a/templates/pkg/pthbs-enter b/templates/pkg/pthbs-enter
@@ -6,7 +6,7 @@
 
 envpath=${PATH%%:*}
 case "$envpath" in
-	(*.env/command) ;;
+	(*/env.*/command) ;;
 	(*)
 		printf "Error: '%s' doesn't look like environment path!\n" "$envpath"
 		printf "PATH='%s'\n" "$PATH"