jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 19:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/unpack: avoid calling scripts/extract for each tarball pattern

Browse Source 
Each time scripts/extract is called it sources config/options which is an
expensive operation.

We call scripts/extract 8 times for each possible tarball pattern, and for
7 of those 8 calls scripts/extract does nothing but source config/options
and then exit.

This change is more efficient, while functionally equivalent.
This commit is contained in:
MilhouseVH 2017-09-14 06:51:41 +01:00
parent 5e3b9a30fc
commit e70485eb84
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
scripts/extract
View File

@ -20,16 +20,16 @@
. config/options $1 . config/options $1
if [ -z "$3" ]; then if [ -z "$2" ]; then
echo "usage: $0 package_name file_pattern target_dir" echo "usage: $0 package_name target_dir"
exit 1 exit 1
fi fi
[ -z "$PKG_URL" -o -z "$PKG_SOURCE_NAME" ] && exit 1 [ -z "$PKG_URL" -o -z "$PKG_SOURCE_NAME" ] && exit 1
[ ! -d "$SOURCES/$1" -o ! -d "$3" ] && exit 1 [ ! -d "$SOURCES/$1" -o ! -d "$2" ] && exit 1
case $PKG_SOURCE_NAME in for pattern in .tar.gz .tar.xz .tar.bz2 .tgz .txz .tbz .7z .zip; do
$2) if [[ $PKG_SOURCE_NAME =~ ${pattern//./\\.}$ ]]; then
f="$SOURCES/$1/$PKG_SOURCE_NAME" f="$SOURCES/$1/$PKG_SOURCE_NAME"
if [ ! -f $f ]; then if [ ! -f $f ]; then
echo "error: File $PKG_SOURCE_NAME doesn't exist in package $1 sources directory" echo "error: File $PKG_SOURCE_NAME doesn't exist in package $1 sources directory"
@ -38,36 +38,37 @@ case $PKG_SOURCE_NAME in
fi fi
case $PKG_SOURCE_NAME in case $PKG_SOURCE_NAME in
*.tar) *.tar)
tar xf $f -C $3 tar xf $f -C $2
;; ;;
*.tar.bz2 | *.tbz) *.tar.bz2 | *.tbz)
tar xjf $f -C $3 tar xjf $f -C $2
;; ;;
*.tar.gz | *.tgz) *.tar.gz | *.tgz)
tar xzf $f -C $3 tar xzf $f -C $2
;; ;;
*.tar.xz | *.txz) *.tar.xz | *.txz)
tar xJf $f -C $3 tar xJf $f -C $2
;; ;;
*.7z) *.7z)
mkdir -p $3/$1 mkdir -p $2/$1
7z x -o$3/$1 $f 7z x -o$2/$1 $f
;; ;;
*.zip) *.zip)
unzip -q $f -d $3 unzip -q $f -d $2
;; ;;
*.diff | *.patch) *.diff | *.patch)
cat $f | patch -d $3 -p1 cat $f | patch -d $2 -p1
;; ;;
*.diff.bz2 | *.patch.bz2 | patch-*.bz2) *.diff.bz2 | *.patch.bz2 | patch-*.bz2)
bzcat $f | patch -d $3 -p1 bzcat $f | patch -d $2 -p1
;; ;;
*.diff.gz | *.patch.gz | patch-*.gz) *.diff.gz | *.patch.gz | patch-*.gz)
zcat $f | patch -d $3 -p1 zcat $f | patch -d $2 -p1
;; ;;
*) *)
cp -pPR $f $3 cp -pPR $f $2
;; ;;
esac esac
;; break
esac fi
done

9
scripts/unpack
View File

@ -81,14 +81,7 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
unpack unpack
else else
if [ -n "$PKG_URL" ]; then if [ -n "$PKG_URL" ]; then
$SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD $SCRIPTS/extract $1 $BUILD
$SCRIPTS/extract $1 "$1*.tbz" $BUILD
$SCRIPTS/extract $1 "$1*.tar.gz" $BUILD
$SCRIPTS/extract $1 "$1*.tar.xz" $BUILD
$SCRIPTS/extract $1 "$1*.txz" $BUILD
$SCRIPTS/extract $1 "$1*.tgz" $BUILD
$SCRIPTS/extract $1 "$1*.7z" $BUILD
$SCRIPTS/extract $1 "$1*.zip" $BUILD
fi fi
fi fi