diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-05 14:21:51 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-05 14:21:51 +0000 |
| commit | 4836ee41d746322e1c2586a96fa53f86cc587578 (patch) | |
| tree | cf42a911aa666b8098721dbe70ca48992c6dffee /trunk/src | |
| parent | d2563da683b5a3ac83ac47ad28995e9855b15005 (diff) | |
| download | simplepkg-4836ee41d746322e1c2586a96fa53f86cc587578.tar.gz simplepkg-4836ee41d746322e1c2586a96fa53f86cc587578.tar.bz2 | |
jail-commit: fix on template_merge
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@238 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src')
| -rwxr-xr-x | trunk/src/jail-commit | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit index 87383d0..9fa80ab 100755 --- 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 |