carbon-core-system

commit a121d20891478bc6f021915f862b578cacfc2f22
parent 397170989e5467916ee140b246a61a4c2193826a
Author: ccx <root@dorje.wpr.cz>
Date:   Fri, 18 Feb 2022 18:17:31 +0100

Work on bzr support

Diffstat:
M
install
 | 
12
+++++++-----

1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/install b/install
@@ -98,6 +98,9 @@ install_dot() {
 	for cmd in init/{command,bin}/*(N); do
 		s6-ln -s ../$cmd ./command/ || exit $?
 	done
+	for cmd in bzr/*/{command,bin,sbin}/*(N); do
+		s6-ln -s ../$cmd ./command/ || exit $?
+	done
 }
 
 install_submodule() {
@@ -171,15 +174,14 @@ install_bzr_repo(){
 	bzr_src=$3
 
 	require bzr_export
-
-	local cmd
-	for cmd in $bzr_dst/{command,bin,sbin}/*(N); do
-		s6-ln -s ../$cmd $sm_dst[.]/command/ || exit $?
-	done
+	s6-ln -s ../$1.$2 $sm_dst[.]/bzr/$1 || exit $?
 }
 install_bzr_repos(){
 	local name url revid
 	local -A repo_sources
+
+	mkdir -p $sm_dst[.]/bzr || exit $?
+
 	<./bzr/sources while IFS=$'\t' read name url; do
 		[[ -n "$name" && -n "$url" ]] || die "Malformed bzr/sources file"
 		(( $+repo_sources[$name] )) && die "Duplicate repo name: ${(qqq)name}"