diff options
| -rw-r--r-- | trunk/lib/common.sh | 6 | ||||
| -rwxr-xr-x | trunk/src/jail-commit | 2 | ||||
| -rwxr-xr-x | trunk/src/templatepkg | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 6d23262..7d9444b 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -391,7 +391,7 @@ function numeric_perm { # just a bit of forbidden secrets if [ -a "$1" ]; then - ls -ln $1| awk '{ print $1 }' | \ + ls -lnd $1 | awk '{ print $1 }' | \ sed -e 's/^.//' -e 's/r/4/g' -e 's/w/2/g' -e 's/x/1/g' \ -e 's/-/0/g' -e 's/\(.\)\(.\)\(.\)/\1+\2+\3/g' | \ fold -w5 | bc -l | xargs | sed -e 's/ //g' @@ -405,7 +405,7 @@ function get_owner { # usage: get_owner <file> if [ -a "$1" ]; then - ls -ln $1 | awk '{ print $3 }' + ls -lnd $1 | awk '{ print $3 }' fi } @@ -416,7 +416,7 @@ function get_group { # usage: get_group <file> if [ -a "$1" ]; then - ls -ln $1 | awk '{ print $4 }' + ls -lnd $1 | awk '{ print $4 }' fi } diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit index ce34d92..c2d66b5 100755 --- a/trunk/src/jail-commit +++ b/trunk/src/jail-commit @@ -48,7 +48,7 @@ function template_merge { echo "" > $TEMPLATE_BASE.perms cd $TEMPLATE_BASE.d - for file in `find | grep -v -e "/.svn$" | grep -v -e "/.svn/"`; do + for file in `find | grep -v -e "/.svn$" | grep -v -e "/.svn/" | grep -v -e "^\.$"`; do if [[ -e "$file" && -e "$1/$file" ]]; then diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg index c1b3b04..b184720 100755 --- a/trunk/src/templatepkg +++ b/trunk/src/templatepkg @@ -221,7 +221,7 @@ function template_update { exit 1 fi - echo Checking package list for template `basename $TEMPLATE_BASE` + echo Checking package list for template `basename $TEMPLATE_BASE`... for package in `ls -1 $ROOT/var/log/packages/`; do pack=`package_name $package` |