mkimage-profiles/bin/mp-commit

#!/bin/sh
# commit the directory ($1) with a message ($2) to git

. 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 [ -n "$INIT" -a ! -d .git ]; then
		git init -q || fatal "git init failed"
	fi
	if [ -n "$(git status -s)" ]; then
		git add . \
		&& git commit -qam "$2" \
		|| fatal "git add/commit failed"
	fi
	popd >/dev/null
fi
git usage refactoring There were heaps of "if type -t git" there already; it wasn't an unintentional mishap but rather a moderate copy-paste to get the use cases, and now these seem to have essentially settled. So time to scrap some dups. NB: the scripts in the generated profile can't rely on the contents of the metaprofile (these need to be able to work in standalone case either), so a bit of crap still lurks there. 2012-08-10 00:32:00 +04:00			`#!/bin/sh`
			`# commit the directory ($1) with a message ($2) to git`

			`. shell-error`

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 c4311108ea2e61b495d83a55fb1e40aabf6c92b9. 2013-02-06 10:54:00 +04:00			`INIT=`
			`if [ "$1" = "-i" ]; then`
			`INIT=yes`
			`shift`
			`fi`

git usage refactoring There were heaps of "if type -t git" there already; it wasn't an unintentional mishap but rather a moderate copy-paste to get the use cases, and now these seem to have essentially settled. So time to scrap some dups. NB: the scripts in the generated profile can't rely on the contents of the metaprofile (these need to be able to work in standalone case either), so a bit of crap still lurks there. 2012-08-10 00:32:00 +04:00			`[ -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`
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 c4311108ea2e61b495d83a55fb1e40aabf6c92b9. 2013-02-06 10:54:00 +04:00			`if [ -n "$INIT" -a ! -d .git ]; then`
git usage refactoring There were heaps of "if type -t git" there already; it wasn't an unintentional mishap but rather a moderate copy-paste to get the use cases, and now these seem to have essentially settled. So time to scrap some dups. NB: the scripts in the generated profile can't rely on the contents of the metaprofile (these need to be able to work in standalone case either), so a bit of crap still lurks there. 2012-08-10 00:32:00 +04:00			`git init -q \|\| fatal "git init failed"`
			`fi`
			`if [ -n "$(git status -s)" ]; then`
			`git add . \`
			`&& git commit -qam "$2" \`
			`\|\| fatal "git add/commit failed"`
			`fi`
			`popd >/dev/null`
			`fi`