fixed mp-commit and its use

Now this is ugly: instead of commoditizing the repetitive code the result ended up working differently by creating several repositories for the target subdirs instead of the single one for the generated subprofile as a whole. This results in .disk/profile.tgz being basically useless in every image since c4311108.

fixed mp-commit and its use
ad264c70 · Michael Shigorin · ec8bcac5 · ad264c70 · ad264c70
Commit ad264c70 authored Feb 06, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

mp-commit bin/mp-commit +7 -1

profile.mk lib/profile.mk +1 -1

No files found.
--- a/bin/mp-commit
+++ b/bin/mp-commit
@@ -3,13 +3,19 @@

 . shell-error

+INIT=
+if [ "$1" = "-i" ]; then
+	INIT=yes
+	shift
+fi
+
 [ -d "$1" ] || fatal "$1 is not an existing directory"

 if type -t git >&/dev/null && pushd "$1" >/dev/null; then
 	if [ -z "$(git config --global user.name)" ]; then
 		exit 0
 	fi
-	if [ ! -d .git ]; then
+	if [ -n "$INIT" -a ! -d .git ]; then
 		git init -q || fatal "git init failed"
 	fi
 	if [ -n "$(git status -s)" ]; then

--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -65,7 +65,7 @@ profile/init: distclean
 		fi >&2; \
 		exit 1; \
 	fi; \
-	mp-commit "$(BUILDDIR)" "derivative profile initialized"; \
+	mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
 	if [ -w . ]; then \
 		rm -f "$(SYMLINK)" && \
 		ln -s "$(BUILDDIR)" "$(SYMLINK)" && \