Allow both specattrs like hide and ops from metadir/ops on a file.

Perform variable expansion on files entries in pkgde.
This commit is contained in:
Tom G. Christensen 2006-06-11 09:47:37 +00:00
parent b28cc5d0eb
commit 1919360026

View File

@ -309,15 +309,18 @@ add_files()
fi fi
doop=$(check_ops "$i") doop=$(check_ops "$i")
fname=$(fix_fname "$i") fname=$(fix_fname "$i")
if [ ! -z "$doop" ]; then
if [ ! -z "$specattr" ]; then
specattr="$specattr $doop"
else
specattr=$doop
fi
fi
if [ ! -z "$specattr" ]; then if [ ! -z "$specattr" ]; then
echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} $specattr" >>$idbfile echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} $specattr" >>$idbfile
else
if [ ! -z "$doop" ]; then
echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} $doop" >>$idbfile
else else
echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat}" >>$idbfile echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat}" >>$idbfile
fi fi
fi
done done
IFS=$OIFS IFS=$OIFS
@ -784,9 +787,9 @@ parse_def()
else # Perhaps we hit 'files'? else # Perhaps we hit 'files'?
if [ "${line:0:5}" == "files" ]; then if [ "${line:0:5}" == "files" ]; then
triplet="${line:6:((${#line}-5-2))}" triplet="${line:6:((${#line}-5-2))}"
defaultperms=$(echo $triplet | $AWK -F, '{ print $1 }') defaultperms=$(_upls $(echo $triplet | $AWK -F, '{ print $1 }'))
defaultuid=$(echo $triplet | $AWK -F, '{ print $2 }') defaultuid=$(_upls $(echo $triplet | $AWK -F, '{ print $2 }'))
defaultgid=$(echo $triplet | $AWK -F, '{ print $3 }') defaultgid=$(_upls $(echo $triplet | $AWK -F, '{ print $3 }'))
foundfiles=1 foundfiles=1
else else
if [ $foundfiles -eq 1 ]; then # We already found the 'files' line so this must be the filelist if [ $foundfiles -eq 1 ]; then # We already found the 'files' line so this must be the filelist