Skip to content

Commit

Permalink
fixup! fixup! Install MacPorts under an arbitrary prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
foretspaisibles committed Jun 15, 2024
1 parent 39f06de commit 4cc24c4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions subr/macports.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 '
Expand All @@ -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 '
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 4cc24c4

Please sign in to comment.