aboutsummaryrefslogtreecommitdiff
path: root/trunk/src/jail-commit
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-04-05 15:36:43 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-04-05 15:36:43 +0000
commit1d1e5b0b53c139702301731e61660e26ba604a3b (patch)
tree6c3cb9c05a6b38db16b6771f9b80e28fe8884351 /trunk/src/jail-commit
parentc385cf792ecefa9181b9febec027f101fee112e1 (diff)
downloadsimplepkg-1d1e5b0b53c139702301731e61660e26ba604a3b.tar.gz
simplepkg-1d1e5b0b53c139702301731e61660e26ba604a3b.tar.bz2
jail-update: small change
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@242 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/jail-commit')
-rwxr-xr-xtrunk/src/jail-commit9
1 files changed, 6 insertions, 3 deletions
diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit
index c2d66b5..1142cb8 100755
--- a/trunk/src/jail-commit
+++ b/trunk/src/jail-commit
@@ -45,7 +45,7 @@ function template_merge {
return 1
fi
- echo "" > $TEMPLATE_BASE.perms
+ echo "" > $TEMPLATE_BASE.perms.tmp
cd $TEMPLATE_BASE.d
for file in `find | grep -v -e "/.svn$" | grep -v -e "/.svn/" | grep -v -e "^\.$"`; do
@@ -67,14 +67,17 @@ function template_merge {
perms="`numeric_perm $1/$file`"
owner="`get_owner $1/$file`"
group="`get_group $1/$file`"
- echo "$file;$owner;$group;$perms" >> $TEMPLATE_BASE.perms
+ echo "$file;$owner;$group;$perms" >> $TEMPLATE_BASE.perms.tmp
else
if [ ! -e "$1/$file" ]; then
- echo $BASENAME: warning: missing file $1/$file
+ echo $BASENAME: warning: missing file $1/$file
fi
fi
+ cat $TEMPLATE_BASE.perms.tmp | sed '/^$/d' > $TEMPLATE_BASE.perms
+ rm -f $TEMPLATE_BASE.perms.tmp
+
done
}