carbon-core-system

Integration repository for versioned configuration and software on Carbon
git clone https://ccx.te2000.cz/git/carbon-core-system
Log | Files | Refs | Submodules

commit 3ac4940e0abaf6c34648f2af8df22d23d100bfce
parent 830497e6901149df485a92bd2b7239fb8f69232c
Author: ccx <root@dorje.wpr.cz>
Date:   Mon, 29 Mar 2021 22:09:54 +0200

Change how commiting works, no need to split submodule initialization and installation anymore.

Diffstat:
Minstall | 16++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/install b/install @@ -31,6 +31,9 @@ make_committed() { (( $#empty_dirs )) && echo "WARNING: $#empty_dirs empty directories found." read -q || exit 0 ( cd $submodule && git add . && git commit ) || exit $? + if [[ $submodule != . ]]; then + git commit -m "update $submodule" -- $submodule || exit $? + fi } install_package() { @@ -141,20 +144,21 @@ submodule() { typeset -g submodule typeset -gA sm_commit sm_dst -submodule -c s6-rc -submodule -c init -submodule -c . submodule package require installed PATH=${sm_dst[package]}/command:$PATH -submodule=s6-rc +submodule -c s6-rc +#submodule=s6-rc require installed -submodule=init +submodule -c init +#submodule=init require installed -submodule=. +submodule -c . +#submodule=. require installed + require current