<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/77b0ef9d4f22af40106e3f376a4a1e1d229ae49a">https://github.com/macports/macports-ports/commit/77b0ef9d4f22af40106e3f376a4a1e1d229ae49a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 77b0ef9d4f22af40106e3f376a4a1e1d229ae49a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jan 2 21:01:56 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> app-1.0.tcl: Use shellescape
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64326
</span>---
_resources/port1.0/group/app-1.0.tcl | 6 +++---
1 file changed, 3 insertions(+), 3 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 44b1a58f6ff..aa50b2e6576 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 '[join ${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 [shellescape ${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 [shellescape ${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 [shellescape ${icon}] -out [shellescape ${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns] 2>&1"}]} {
</span> return -code error "app.icon '[join ${app.icon}]' could not be converted to ${app.name}.icns: $::errorInfo"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,7 +438,7 @@ proc app._write_launch_script {executable app_destination} {
</span>
puts ${launch_script} "#!/bin/bash
export PATH=\"${prefix}/bin:${prefix}/sbin:\$PATH\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-exec ${executable}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec [shellescape ${executable}]
</span> "
close ${launch_script}
file attributes ${app_destination} -permissions 0755
</pre><pre style='margin:0'>
</pre>