Skip to content
Permalink
Browse files

minivmac*: Use shellescape

  • Loading branch information
ryandesign committed Jun 27, 2020
1 parent 35b9cf1 commit 6dd4916234b4dcf66d06cb2cbe3d1308f5bda6b0
Showing with 4 additions and 4 deletions.
  1. +2 −2 emulators/minivmac-devel/Portfile
  2. +2 −2 emulators/minivmac/Portfile
@@ -114,7 +114,7 @@ if {${my_subport} eq ${my_name}} {
build.dir ${workpath}/build

post-extract {
system -W ${workpath} "unzip -q '${distpath}/${my_icons_distfile}'"
system -W ${workpath} "unzip -q [shellescape ${distpath}/${my_icons_distfile}]"
}

post-patch {
@@ -163,7 +163,7 @@ if {${my_subport} eq ${my_name}} {
set all_configure_args [concat ${configure.pre_args} ${configure.args} ${configure.post_args}]

# Run the configure script.
system -W ${build.dir}/${my_variation_dir} "CC='${configure.cc}' CFLAGS='${configure.optflags}' ${worksrcpath}/configure ${all_configure_args}"
system -W ${build.dir}/${my_variation_dir} "CC=[shellescape ${configure.cc}] CFLAGS=[shellescape ${configure.optflags}] [shellescape ${worksrcpath}/configure] ${all_configure_args}"

lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]

@@ -112,7 +112,7 @@ if {${my_subport} eq ${my_name}} {
build.dir ${workpath}/build

post-extract {
system -W ${workpath} "unzip -q '${distpath}/${my_icons_distfile}'"
system -W ${workpath} "unzip -q [shellescape ${distpath}/${my_icons_distfile}]"
}

post-patch {
@@ -160,7 +160,7 @@ if {${my_subport} eq ${my_name}} {
set all_configure_args [concat ${configure.pre_args} ${configure.args} ${configure.post_args}]

# Run the configure script.
system -W ${build.dir}/${my_variation_dir} "CC='${configure.cc}' CFLAGS='${configure.optflags}' ${worksrcpath}/configure ${all_configure_args}"
system -W ${build.dir}/${my_variation_dir} "CC=[shellescape ${configure.cc}] CFLAGS=[shellescape ${configure.optflags}] [shellescape ${worksrcpath}/configure] ${all_configure_args}"

lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]

2 comments on commit 6dd4916

@jmroot

This comment has been minimized.

Copy link
Member

@jmroot jmroot replied Jun 28, 2020

You can't use shellescape in Portfiles with MacPorts 2.6.2; I only just made it available as part of macports/macports-base@8a088c3.

@ryandesign

This comment has been minimized.

Copy link
Contributor Author

@ryandesign ryandesign replied Jun 28, 2020

Whoops, thanks for pointing that out. Fixed in a009bb7.

Please sign in to comment.
You can’t perform that action at this time.