Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sometimes ${var:1} returns garbage if var only contains exactly one

Browse Source 
character. This issue was first observed with Bash 3.1 on Irix 6.2.
This is just a simple workaround which is probably also more correct.
This commit is contained in:
Tom G. Christensen 2006-03-11 09:16:39 +00:00
parent 4e6ebc02b9
commit 21c6d18294
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
buildpkg.packaging.irix
View File

@ -285,9 +285,14 @@ add_files()
local group=$5 local group=$5
local specattr=$6 local specattr=$6
local slash='' local slash=''
local topinstd=${topinstalldir:1}
[ ! "$topinstalldir" == "/" ] && slash='/' #="${topinstalldir}/" [ ! "$topinstalldir" == "/" ] && slash='/' #="${topinstalldir}/"
# This is a workaround
# Sometimes $topinstalldir:1 returns garbage when topinstalldir=/
[ "$topinstalldir" = "/" ] && topinstd=""
local FILES=$($FIND $fspec -type f -print|$TEE -a $metadir/files.tmp) local FILES=$($FIND $fspec -type f -print|$TEE -a $metadir/files.tmp)
OIFS=$IFS # We play IFS tricks so we can handle filenames with embedded spaces OIFS=$IFS # We play IFS tricks so we can handle filenames with embedded spaces
IFS=" IFS="
@ -304,12 +309,12 @@ add_files()
doop=$(check_ops "$i") doop=$(check_ops "$i")
fname=$(fix_fname "$i") fname=$(fix_fname "$i")
if [ ! -z "$specattr" ]; then if [ ! -z "$specattr" ]; then
echo "f $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat} $specattr" >>$idbfile echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} $specattr" >>$idbfile
else else
if [ ! -z "$doop" ]; then if [ ! -z "$doop" ]; then
echo "f $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat} $doop" >>$idbfile echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} $doop" >>$idbfile
else else
echo "f $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat}" >>$idbfile echo "f $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat}" >>$idbfile
fi fi
fi fi
@ -332,7 +337,7 @@ add_files()
local temp=`$LS -l "$i"|$CUT -d '>' -f 2` local temp=`$LS -l "$i"|$CUT -d '>' -f 2`
local symval=${temp# } local symval=${temp# }
fname=$(fix_fname "$i") fname=$(fix_fname "$i")
echo "l $perm $owner $group ${topinstalldir:1}${slash}$fname $i ${pkgname}.${prodcat} symval($symval)" >>$idbfile echo "l $perm $owner $group ${topinstd}${slash}$fname $i ${pkgname}.${prodcat} symval($symval)" >>$idbfile
done done
IFS=$OIFS IFS=$OIFS
} }
@ -347,8 +352,13 @@ add_dir()
local defperm=$3 local defperm=$3
local owner=$4 local owner=$4
local group=$5 local group=$5
local topinstd="${topinstalldir:1}"
[ ! "$topinstalldir" == "/" ] && topinstalldir="${topinstalldir}/" [ ! "$topinstalldir" == "/" ] && topinstalldir="${topinstalldir}/"
# This is a workaround
# Sometimes $topinstalldir:1 returns garbage when topinstalldir=/
[ "$topinstalldir" = "/" ] && topinstd=""
# Note that dir blablah is *not* added to $metadir/files.tmp # Note that dir blablah is *not* added to $metadir/files.tmp
local FILES=$($FIND $fspec -type d -print) local FILES=$($FIND $fspec -type d -print)
@ -365,7 +375,7 @@ add_dir()
perm=$defperm perm=$defperm
fi fi
fname=$(fix_fname "$i") fname=$(fix_fname "$i")
echo "d $perm $owner $group ${topinstalldir:1}$fname $i ${pkgname}.${prodcat}" >>$idbfile echo "d $perm $owner $group ${topinstd}$fname $i ${pkgname}.${prodcat}" >>$idbfile
done done
IFS=$OIFS IFS=$OIFS
} }