From 4cc24c4ec56e992a06c88b7c31f6029079559c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Le=20Barbier?= Date: Sat, 15 Jun 2024 06:34:09 +0200 Subject: [PATCH] fixup! fixup! Install MacPorts under an arbitrary prefix --- subr/macports.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subr/macports.sh b/subr/macports.sh index 942090b..ab7f304 100644 --- a/subr/macports.sh +++ b/subr/macports.sh @@ -62,7 +62,7 @@ YAML variants_document() { if [ "$#" -eq 0 ]; then - set -- "${macports_prefix}/etc/gha-install-macports.yaml" + set -- "${macports_prefix}/etc/setup-macports.yaml" fi printf '# MacPorts system-wide global variants configuration file.\n' @@ -82,7 +82,7 @@ variants_document() ports_document() { if [ "$#" -eq 0 ]; then - set -- "${macports_prefix}/etc/gha-install-macports.yaml" + set -- "${macports_prefix}/etc/setup-macports.yaml" fi yq ' @@ -100,7 +100,7 @@ ports_document() sources_document() { if [ "$#" -eq 0 ]; then - set -- "${macports_prefix}/etc/gha-install-macports.yaml" + set -- "${macports_prefix}/etc/setup-macports.yaml" fi yq ' @@ -131,7 +131,7 @@ make_package() case $# in 0) macos=$(probe_macos) - version=$(yq ".version // \"${macports_version}\"" < "${macports_prefix}/etc/gha-install-macports.yaml") + version=$(yq ".version // \"${macports_version}\"" < "${macports_prefix}/etc/setup-macports.yaml") ;; 1) macos=$(probe_macos)