jail-commit: fix on template_merge

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@238 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit
index 87383d0a3514951f7c5f031c9cb2588544a9811b..9fa80aba1e6ee597b5e13ec8d9563e280bc99d66 100755 (executable)
--- a/trunk/src/jail-commit
+++ b/trunk/src/jail-commit
@@ -17,11 +17,12 @@
 #
 
 COMMON="/usr/libexec/simplepkg/common.sh"
+BASENAME="`basename $0`"
 
 if [ -f "$COMMON" ]; then
   source $COMMON
 else
-  echo "error: file $COMMON found, check your `basename $0` installation"
+  echo "error: file $COMMON found, check your $BASENAME installation"
   exit 1
 fi
 
@@ -46,7 +47,7 @@ function template_merge {
   echo "" > $TEMPLATE_BASE.perms
   cd $TEMPLATE_BASE.d
 
-  for file in `find`; do
+  for file in `find | grep -v -e "/.svn$" | grep -v -e "/.svn/"`; do
     if [[ -f "$file" && -f "$1/$file" ]]; then
       if ! diff $file $1/$file; then
         echo updating $file