diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-06 04:45:23 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-06 04:45:23 +0000 |
| commit | 9abb526d0c1b359084b028161b881bd894c53877 (patch) | |
| tree | bb3c5cf0c96220ad67448418b7000e1520aa6f56 /trunk/src | |
| parent | 016b7fe6722b9853f4fb7e2aaa185907d39678de (diff) | |
| download | simplepkg-9abb526d0c1b359084b028161b881bd894c53877.tar.gz simplepkg-9abb526d0c1b359084b028161b881bd894c53877.tar.bz2 | |
jail-commit: now using just one commit per run
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@289 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src')
| -rwxr-xr-x | trunk/src/jail-commit | 4 | ||||
| -rwxr-xr-x | trunk/src/templatepkg | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit index e09ca3e..d8cd987 100755 --- a/trunk/src/jail-commit +++ b/trunk/src/jail-commit @@ -94,6 +94,7 @@ function template_svn_commit { # usage: template_svn_commit <template-folder> if use_svn && [ -d "$1/.svn" ]; then + echo Commiting changes to the repository... cd $1 svn commit -m "changes for `date`" if [ "$?" != "0" ]; then @@ -129,7 +130,6 @@ function do_commit { if [ -d "$TEMPLATE_BASE.d" ] || [ -a "$TEMPLATE_BASE.template" ]; then templatepkg -u $template $jailpath template_merge $jailpath - template_svn_commit `dirname $TEMPLATE_BASE` fi fi @@ -144,6 +144,7 @@ elif echo $1 | grep -q -e "^--"; then elif [ ! -z "$1" ]; then echo "This is jail-commit; Run \"$BASENAME --help\" for help" do_commit $1 $2 + template_svn_commit `dirname $TEMPLATE_BASE` else echo "This is jail-commit; Run \"$BASENAME --help\" for help" if [ -f $JAIL_LIST ]; then @@ -153,5 +154,6 @@ else fi # main jail do_commit / main + template_svn_commit $BASE_CONF/templates fi diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg index da717a3..c218638 100755 --- a/trunk/src/templatepkg +++ b/trunk/src/templatepkg @@ -480,7 +480,7 @@ function template_delete { # delete a file from a template # usage: template_delete <file> - if [ -a "$TEMPLATE_BASE.d/$1" ]; then + if [ -e "$TEMPLATE_BASE.d/$1" ]; then if use_svn && [ -d "$TEMPLATE_BASE.d/.svn" ]; then cd $TEMPLATE_BASE.d svn del --force ./$1 || rm -rf ./$1 |