From 8819925af474526ea8d89ebf4abbc17bd0e14281 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 31 Jul 2023 14:56:40 +0100
Subject: [PATCH] package/resources: improve text output.

- use the system font instead of Helvetica
- cleanup font definitions
- add extra newline to `CONCLUSION.rtf` to next steps not showing up
  without a click
- add actual hyperlinks to `CONCLUSION.rtf`

Fixes #15793
---
 .github/workflows/build-pkg.yml  |  2 +-
 package/resources/CONCLUSION.rtf | 12 ++++++++----
 package/resources/WELCOME.rtf    | 15 ++++++++-------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-pkg.yml b/.github/workflows/build-pkg.yml
index 23c2ad3a27428..c37106a501ba2 100644
--- a/.github/workflows/build-pkg.yml
+++ b/.github/workflows/build-pkg.yml
@@ -3,7 +3,7 @@ on:
   push:
     paths:
       - .github/workflows/build-pkg.yml
-      - package/
+      - package/**/*
   release:
     types:
       - published
diff --git a/package/resources/CONCLUSION.rtf b/package/resources/CONCLUSION.rtf
index a853dc32fb28a..80dedfd995085 100644
--- a/package/resources/CONCLUSION.rtf
+++ b/package/resources/CONCLUSION.rtf
@@ -1,5 +1,5 @@
 {\rtf1\ansi\ansicpg1252\cocoartf2709
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 Menlo-Regular;
+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 HelveticaNeue-Bold;\f1\fnil\fcharset0 HelveticaNeue;\f2\fnil\fcharset0 Menlo-Regular;
 }
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
@@ -15,13 +15,13 @@
 \
 Read the analytics documentation (and how to opt-out) here:\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls1\ilvl0\cf0 {\listtext	\uc0\u8259 	}\ul https://docs.brew.sh/Analytics\
+\ls1\ilvl0\cf0 {\listtext	\uc0\u8259 	}{\field{\*\fldinst{HYPERLINK "https://docs.brew.sh/Analytics"}}{\fldrslt \ul https://docs.brew.sh/Analytics}}\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \ulnone No analytics data has been sent yet.\
 \
 Homebrew is run entirely by unpaid volunteers. Please consider donating:\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls2\ilvl0\cf0 {\listtext	\uc0\u8259 	}\ul https://github.com/Homebrew/brew#donations\
+\ls2\ilvl0\cf0 {\listtext	\uc0\u8259 	}{\field{\*\fldinst{HYPERLINK "https://github.com/Homebrew/brew#donations"}}{\fldrslt \ul https://github.com/Homebrew/brew#donations}}\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \ulc0 \
 \ulnone Next steps:\ul \
@@ -40,4 +40,8 @@ Homebrew is run entirely by unpaid volunteers. Please consider donating:\
 \f1  to get started\
 {\listtext	\uc0\u8259 	}Further documentation:\
 \pard\tx940\tx1440\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li1440\fi-1440\pardirnatural\partightenfactor0
-\ls3\ilvl1\cf0 {\listtext	\uc0\u8259 	}\ul https://docs.brew.sh}
\ No newline at end of file
+\ls3\ilvl1\cf0 {\listtext	\uc0\u8259 	}{\field{\*\fldinst{HYPERLINK "https://docs.brew.sh"}}{\fldrslt \ul https://docs.brew.sh}}\ul \
+\pard\tx940\tx1440\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li1440\fi-1440\pardirnatural\partightenfactor0
+\cf0 \
+\
+}
\ No newline at end of file
diff --git a/package/resources/WELCOME.rtf b/package/resources/WELCOME.rtf
index 98a36a2d262c1..21b489cae79b0 100644
--- a/package/resources/WELCOME.rtf
+++ b/package/resources/WELCOME.rtf
@@ -1,5 +1,5 @@
 {\rtf1\ansi\ansicpg1252\cocoartf2709
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Menlo-Regular;}
+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;\f1\fnil\fcharset0 Menlo-Regular;}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
 {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}}
@@ -9,11 +9,12 @@
 
 \f0\fs24 \cf0 This package will install to:\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls1\ilvl0
-\f1 \cf0 {\listtext	\uc0\u8259 	}/opt/homebrew
+\ls1\ilvl0\cf0 {\listtext	\uc0\u8259 	}
+\f1 /opt/homebrew
 \f0  on Apple Silicon\
-\ls1\ilvl0
-\f1 {\listtext	\uc0\u8259 	}/usr/local/bin/brew 
-\f0 and 
+{\listtext	\uc0\u8259 	}
+\f1 /usr/local/bin/brew
+\f0  and 
 \f1 /usr/local/Homebrew
-\f0  on Intel}
\ No newline at end of file
+\f0  on Intel\
+}
\ No newline at end of file