bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: Full tar portability. Closes #143

Browse Source
This commit is contained in:
Dylan Araps 2020-05-08 22:12:27 +03:00
parent 994f5b69e9
commit bbb1873f6e
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kiss
View File

@ -394,16 +394,38 @@ pkg_extract() {
# Git repository, comment or blank line.
git+*|\#*|'') continue ;;
# Only 'tar' and 'zip' archives are currently supported for
# extraction. Other filetypes are simply copied to '$mak_dir'
# which allows for manual extraction.
# Tarballs of any kind. This is a shell equivalent of
# GNU tar's '--strip-components 1'.
*://*.tar|*://*.tar.??|*://*.tar.???|*://*.tar.????|*://*.tgz)
decompress "$src_dir/$1/${src##*/}" |
"$tar" xf - --strip-components 1 ||
decompress "$src_dir/$1/${src##*/}" > .ktar
"$tar" xf .ktar ||
die "$1" "Couldn't extract ${src##*/}"
tar tf .ktar | while read -r dir; do dir=${dir%/*}
# Some tarballs contain './' as the top-level directory,
# we need to skip these occurances.
[ -d "${dir#.}" ] || continue
# First attempt to move all files up a directory level,
# if any files/directories fail (due to mv's lack of
# directory merge capability), simply do the exercise
# again and copy-merge the remaining files/directories.
find "$dir/." ! -name . -prune -exec mv -f {} . + ||
find "$dir/." ! -name . -prune -exec cp -fRp {} . +
# Remove the directory now that all files have been
# transferred out of it. This can't be a simple 'rmdir'
# as we may leave files in here due above.
rm -rf "$dir"
done 2>/dev/null
# Clean up after ourselves and remove the temporary tar
# archive we've created. Not needed at all really.
rm -f .ktar
;;
# Zip archives.
*://*.zip)
unzip "$src_dir/$1/${src##*/}" ||
die "$1" "Couldn't extract ${src##*/}"