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

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 63b374837b4bc245f2d7cab5c68359e5ab41c886..f150b76ff2ff55dfa07bcc46c97024e03084190f 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -5,7 +5,7 @@
 
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
-BUILD=${BUILD:=3rha}
+BUILD=${BUILD:=1rha}
 VERSION="0.5pre1"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"

diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit
index e09ca3eea6478582fc9a5fafd1fbb5fb46d98005..d8cd987e1f989bca358639795331c4c796e86e0e 100755 (executable)
--- 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 da717a3d9470ac4c0f39c8719447b5c0111c3c37..c218638732c633029c3fd9a20a878020afe118bd 100755 (executable)
--- 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