Skip to content

Commit

Permalink
minivmac*: Use shellescape
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryandesign
ryandesign committed Jun 27, 2020
1 parent 35b9cf1 commit 6dd4916
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions emulators/minivmac-devel/Portfile
View file
Expand Up @@ -114,7 +114,7 @@ if {${my_subport} eq ${my_name}} {
build.dir ${workpath}/build build.dir ${workpath}/build


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


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


# Run the configure script. # 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/ /\\\\ /}] lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]


Expand Down
4 changes: 2 additions & 2 deletions emulators/minivmac/Portfile
View file
Expand Up @@ -112,7 +112,7 @@ if {${my_subport} eq ${my_name}} {
build.dir ${workpath}/build build.dir ${workpath}/build


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


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


# Run the configure script. # 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/ /\\\\ /}] lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]


Expand Down

2 comments on commit 6dd4916

@jmroot
Copy link
Member

@jmroot jmroot commented on 6dd4916 Jun 28, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.