carbon-core-system

commit 34f823ce96fc6d82342a6bbe11259fab6852c5f5
parent f8bd698c263e15d15120ebe91619e48b526b0651
Author: ccx <root@dorje.wpr.cz>
Date:   Thu, 11 Mar 2021 13:26:21 +0100

Variable name fixes.

Diffstat:
M
install
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/install b/install
@@ -41,7 +41,7 @@ install_rc() {
 	local dst=${sm_dst[$submodule]}
 	local cmd=${sm_dst[package]}/command
 	mkdir -p $dst/s6-rc/source || exit $?
-	git archive --format=tar $commit | tar -xC $dst/s6-rc/source
+	git archive --format=tar ${sm_commit[$submodule]} | tar -xC $dst/s6-rc/source
 	((${(j.|.)pipestatus})) && exit 1  # exit if git archive or tar exited non-zero
 	$cmd/s6-rc-compile $dst/s6-rc/source $dst/s6-rc/compiled || exit $?
 }
@@ -97,9 +97,6 @@ make_current() {
 }
 typeset -f -t make_union
 
-typeset -g submodule
-typeset -gA sm_commit sm_dst
-
 submodule() {
 	local -a do_commit
 	zparseopts -D c=do_commit
@@ -117,6 +114,11 @@ submodule() {
 }
 typeset -f -t submodule
 
+# End of functions, now install things in right order
+
+typeset -g submodule
+typeset -gA sm_commit sm_dst
+
 submodule -c s6-rc
 submodule -c .