diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-04 20:21:00 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-04 20:21:00 +0000 |
| commit | 81f1988b5f820f3ff0af56484d7279da03027f79 (patch) | |
| tree | 3b6ba720350b42d5fa54ccceff76a16fbcf2140f | |
| parent | ec8e72feb16dab683b1da63c9a3c3de8ff435d78 (diff) | |
| download | simplepkg-81f1988b5f820f3ff0af56484d7279da03027f79.tar.gz simplepkg-81f1988b5f820f3ff0af56484d7279da03027f79.tar.bz2 | |
jail-commit: minor fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@236 04377dda-e619-0410-9926-eae83683ac58
| -rwxr-xr-x | trunk/src/jail-commit | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit index 76e326b..d338e75 100755 --- a/trunk/src/jail-commit +++ b/trunk/src/jail-commit @@ -69,9 +69,15 @@ function template_merge { function template_svn_commit { - if use_svn; then - cd `dirname $TEMPLATE_BASE` + # issue a svn_commit from a template folder + # usage: template_svn_commit <template-folder> + + if use_svn && [ -d "$1/.svn" ]; then + cd $1 svn commit -m "changes for `date`" + if [ "$?" != "0" ]; then + echo $BASENAME: commit error + fi fi } @@ -95,14 +101,14 @@ function do_commit { search_template $template --update if [ "$?" == "0" ]; then if [ "$jailpath" == "/" ]; then - echo updating main installation... + echo Updating main installation... else - echo updating $jailpath... + echo Updating $jailpath... fi if [ -d "$TEMPLATE_BASE.d" ] || [ -a "$TEMPLATE_BASE.template" ]; then templatepkg -u $template $jailpath template_merge $jailpath - template_svn_commit $TEMPLATE_BASE + template_svn_commit `dirname $TEMPLATE_BASE` fi fi |