chocolate-doom/chocpkg
0
0
Fork 0
mirror of https://github.com/chocolate-doom/chocpkg.git synced 2024-11-10 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for decompressing .bz2 files.

Browse source 
This should resolve the blocking issue with libmpg321 which is distributed
in .tar.bz2 format.
This commit is contained in:
Simon Howard 2020-04-10 20:02:09 -04:00
parent e13fe8f8c5
commit 8782712aaf
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chocpkg/modules/fetch_download.sh
View file

@ -3,7 +3,7 @@ fetch_download::init() {
PACKAGE_URL=$1 PACKAGE_URL=$1
PACKAGE_SHA256_DIGEST=$2 PACKAGE_SHA256_DIGEST=$2
PACKAGE_FILENAME=$(basename "$PACKAGE_URL") PACKAGE_FILENAME=$(basename "$PACKAGE_URL")
PACKAGE_DIR_NAME="${PACKAGE_FILENAME/.tar.gz/}" PACKAGE_DIR_NAME="${PACKAGE_FILENAME/%.tar.*/}"
IS_TAR_BOMB=false IS_TAR_BOMB=false
} }
@ -35,6 +35,21 @@ fetch_download::download_package_file() {
fi fi
} }
fetch_download::decompress() {
local filename="$1"
case "$filename" in
*.gz)
gunzip < $filename
;;
*.bz2)
bunzip2 < $filename
;;
*)
chocpkg::abort "unknown compression format for filename $filename"
;;
esac
}
fetch_download::extract_package_file() { fetch_download::extract_package_file() {
local dlfile="$PACKAGES_DIR/$PACKAGE_FILENAME" local dlfile="$PACKAGES_DIR/$PACKAGE_FILENAME"
# Well-formed tar files contain a single directory that matches their # Well-formed tar files contain a single directory that matches their
@ -47,7 +62,7 @@ fetch_download::extract_package_file() {
local parent_dir=$(dirname "$PACKAGE_BUILD_DIR") local parent_dir=$(dirname "$PACKAGE_BUILD_DIR")
cd "$parent_dir" cd "$parent_dir"
fi fi
(gunzip < "$dlfile" | tar -x) || ( (fetch_download::decompress "$dlfile" | tar -x) || (
mv "$dlfile" "$dlfile.bad" mv "$dlfile" "$dlfile.bad"
chocpkg::abort "Failed to extract $PACKAGE_FILENAME: bad download?" chocpkg::abort "Failed to extract $PACKAGE_FILENAME: bad download?"
) )