<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b833d34823a2f8c5c8b40a30efbc078e0c3de2dc">https://github.com/macports/macports-base/commit/b833d34823a2f8c5c8b40a30efbc078e0c3de2dc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b833d34823a2f8c5c8b40a30efbc078e0c3de2dc
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Tue Nov 7 22:38:39 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> registry2.0: Apply HFS+ compression on extraction
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> HFS+ compression is applied if a bsdtar is available that
</span><span style='display:block; white-space:pre;color:#404040;'> supports --hfsCompression.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/36560
</span>---
src/registry2.0/portimage.tcl | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 15a86a7..3b895f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,15 +350,24 @@ proc extract_archive_to_tmpdir {location} {
</span> }
}
t(ar|bz|lz|xz|gz) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set tar "tar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set tar [macports::findBinary $tar ${macports::autoconf::tar_path}]} errmsg]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $errmsg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw MACPORTS "No '$tar' was found on this system!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Opportunistic HFS compression. bsdtar will automatically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable this if filesystem does not support compression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {macports::binaryInPath bsdtar}] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![catch {exec bsdtar -x --hfsCompression < /dev/null >& /dev/null}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Using bsdtar with HFS+ compression (if valid)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unarchive.cmd "bsdtar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unarchive.pre_args {-xvp --hfsCompression -f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tar "tar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set tar [macports::findBinary $tar ${macports::autoconf::tar_path}]} errmsg]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $errmsg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw MACPORTS "No '$tar' was found on this system!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Using $tar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unarchive.cmd "$tar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unarchive.pre_args {-xvpf}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Using $tar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set unarchive.cmd "$tar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set unarchive.pre_args {-xvpf}
</span> if {[regexp {z2?$} ${unarchive.type}]} {
set unarchive.args {-}
if {[regexp {bz2?$} ${unarchive.type}]} {
</pre><pre style='margin:0'>
</pre>