Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 18 years ago
parent
commit
642d2af234
1 changed files with 12 additions and 4 deletions
  1. +12
    -4
      scripts/functions

+ 12
- 4
scripts/functions

@ -651,18 +651,26 @@ build_this_package() {
var_append patchfiles " " \ var_append patchfiles " " \
"`ls $confdir/*.patch.${xsrctar/-[0-9]*/} 2> /dev/null`" "`ls $confdir/*.patch.${xsrctar/-[0-9]*/} 2> /dev/null`"
if [ $autoextract = 1 ]; then if [ $autoextract = 1 ]; then
echo "Extracting $xsrctar ($taropt) ... "
if [[ $xsrctar == *.zip ]] ; then
extractcmd="unzip"
cutcmd="cut -f1 -d/ | cut -f2 -d:"
else
extractcmd="tar -v $taropt"
cutcmd="cut -f1 -d/"
fi
echo "Extracting $xsrctar ($extractcmd) ... "
cd $builddir cd $builddir
tar -v $taropt $archdir/$xsrctar | tee untar.txt |
cut -f1 -d/ | sort -u > xsrcdir.txt
$extractcmd $archdir/$xsrctar | tee untar.txt |
eval $cutcmd | sort -u > xsrcdir.txt
# #
if [ $srcdir = auto ]; then if [ $srcdir = auto ]; then
xsrcdir=${xsrctar%.tar.bz2} xsrcdir=${xsrctar%.tar.bz2}
xsrcdir=${xsrcdir%.tbz2} xsrcdir=${xsrcdir%.tbz2}
xsrcdir=${xsrcdir%.zip}
if [ ! -d $xsrcdir ] ; then if [ ! -d $xsrcdir ] ; then
for x in $pkg-$ver ${pkg}_$ver $pkg \ for x in $pkg-$ver ${pkg}_$ver $pkg \
$xpkg-$ver ${xpkg}_$ver $xpkg \ $xpkg-$ver ${xpkg}_$ver $xpkg \
"$( cat xsrcdir.txt )"
$( cat xsrcdir.txt )
do do
[ -d "$x" ] && xsrcdir="$x" [ -d "$x" ] && xsrcdir="$x"
done done

Loading…
Cancel
Save