<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6762366e4abd57d632f8761705efbead0e77e60">https://github.com/macports/macports-ports/commit/c6762366e4abd57d632f8761705efbead0e77e60</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c6762366e4a app-1.0.tcl: Don't create a file called @1
</span>c6762366e4a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c6762366e4abd57d632f8761705efbead0e77e60
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 7 00:12:20 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> app-1.0.tcl: Don't create a file called @1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This problem was introduced when the portgroup switched from using exec
</span><span style='display:block; white-space:pre;color:#404040;'> to using system in f7dc431. 2>@1 is the syntax to redirect stderr to
</span><span style='display:block; white-space:pre;color:#404040;'> stdout when using exec but 2>&1 is the syntax when using system.
</span>---
_resources/port1.0/group/app-1.0.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/app-1.0.tcl b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a1e63b623cd..a6caeedebc3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,13 +279,13 @@ platform macosx {
</span> return -code error "app.icon ${app.icon} could not be converted to png: $::errorInfo"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns $makeicnsargs -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>@1"}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns $makeicnsargs -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>&1"}]} {
</span> return -code error "app.icns could not be created: $::errorInfo"
}
# If app.icon is another type of image file, convert it.
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns -in ${icon} -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>@1"}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns -in ${icon} -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>&1"}]} {
</span> return -code error "app.icon ${app.icon} could not be converted to ${app.name}.icns: $::errorInfo"
}
}
</pre><pre style='margin:0'>
</pre>