From 425611d8db5d7627b4acd68dd51952a9990bb3ac Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Sat, 16 Sep 2023 08:05:15 +1000 Subject: [PATCH] Use shellescape on packagemaker path Fixes: https://trac.macports.org/ticket/39405 --- src/package1.0/portpkg.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package1.0/portpkg.tcl b/src/package1.0/portpkg.tcl index f5150f411e..a7b67a7cba 100644 --- a/src/package1.0/portpkg.tcl +++ b/src/package1.0/portpkg.tcl @@ -163,7 +163,7 @@ proc portpkg::package_pkg {portname portepoch portversion portrevision} { if {$using_pkgbuild} { set cmdline "$pkgbuild --root [shellescape ${destpath}] ${pkgresources} --info [shellescape $infofile] --install-location / --identifier org.macports.$portname" } else { - set cmdline "PMResourceLocale=${language} $packagemaker --root [shellescape ${destpath}] --out [shellescape ${pkgpath}] ${pkgresources} --info [shellescape $infofile] --target $pkgtarget --domain system --id org.macports.$portname" + set cmdline "PMResourceLocale=${language} [shellescape $packagemaker] --root [shellescape ${destpath}] --out [shellescape ${pkgpath}] ${pkgresources} --info [shellescape $infofile] --target $pkgtarget --domain system --id org.macports.$portname" } if {${os.major} >= 10} { set v [mp_version_to_apple_version $portepoch $portversion $portrevision] @@ -193,7 +193,7 @@ proc portpkg::package_pkg {portname portepoch portversion portrevision} { } else { write_info_plist ${workpath}/Info.plist $portname $portversion $portrevision write_description_plist ${workpath}/Description.plist $portname $portversion $description - system "$packagemaker -build -f [shellescape ${destpath}] -p [shellescape ${pkgpath}] -r [shellescape ${package.resources}] -i [shellescape ${workpath}/Info.plist] -d [shellescape ${workpath}/Description.plist]" + system "[shellescape $packagemaker] -build -f [shellescape ${destpath}] -p [shellescape ${pkgpath}] -r [shellescape ${package.resources}] -i [shellescape ${workpath}/Info.plist] -d [shellescape ${workpath}/Description.plist]" } file delete ${workpath}/Info.plist \