<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/7921b2e05e9a4c9cda6efedee496affb305dcc07">https://github.com/macports/macports-base/commit/7921b2e05e9a4c9cda6efedee496affb305dcc07</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7921b2e05e9a4c9cda6efedee496affb305dcc07
</span>Author: Andrew L. Moore <slewsys@gmail.com>
AuthorDate: Fri Dec 29 15:54:09 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> portextract: Create symlink if no $worksrcpath
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If expected extract path doesn't exist, create a symlink
</span><span style='display:block; white-space:pre;color:#404040;'> from expected directory to the actual one.
</span><span style='display:block; white-space:pre;color:#404040;'> If $worksrcdir is explicitly set, nothing is done.
</span>---
src/port1.0/portextract.tcl | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portextract.tcl b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 791f444..00a1bbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +124,7 @@ proc portextract::extract_start {args} {
</span> }
proc portextract::extract_main {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global UI_PREFIX filespath worksrcpath extract.dir use_dmg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global UI_PREFIX filespath workpath worksrcdir worksrcpath extract.dir use_dmg
</span>
if {![exists distfiles] && ![exists extract.only]} {
# nothing to do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,5 +156,16 @@ proc portextract::extract_main {args} {
</span>
chownAsRoot ${extract.dir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If expected path of extract doesn't exist && worksrcdir is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # not explicitly set to subdirectory, symlink to actual path.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file isdirectory $worksrcpath] && [regexp {^[^/]+$} $worksrcdir]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set workdirs [glob -nocomplain -types d [file join $workpath *]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength $workdirs] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dir [file tail [lindex $workdirs 0]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug [format [msgcat::mc "Symlink: %s -> %s"] $worksrcpath $dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symlink $dir $worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> return 0
}
</pre><pre style='margin:0'>
</pre>