From 8db71c432d1f832436af5a098cd93b0f6aea46b8 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 11 Nov 2023 17:08:22 +0100
Subject: [PATCH] Fix MacOS build and add font credits

---
 CREDITS.md                             |  6 ++++++
 novelwriter/assets/text/credits_en.htm |  7 +++++++
 setup/macos/build.sh                   | 11 +++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index d792ce6f..68e673e9 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -52,6 +52,12 @@ Some of the assets bundled with novelWriter were adapted from the following sour
 * [Owl](https://github.com/sdras/night-owl-vscode-theme) syntax themes by Sarah Drasner (MIT License)
 * [Solarized](https://github.com/altercation/solarized) themes by Ethan Schoonover (MIT License)
 
+## Fonts
+
+The font used for the main novelWriter logo, mimetype and text banners is:
+
+* Pridi by Cadson Demak (Open Font License, Version 1.1)
+
 ## Special Mentions
 
 Additional thanks to @johnblommers who was an early user and who has provided a lot of very useful
diff --git a/novelwriter/assets/text/credits_en.htm b/novelwriter/assets/text/credits_en.htm
index 525ffca9..98393ef6 100644
--- a/novelwriter/assets/text/credits_en.htm
+++ b/novelwriter/assets/text/credits_en.htm
@@ -61,6 +61,13 @@ more contributions are listed on the project's <a href="https://crowdin.com/proj
   <a href="https://github.com/altercation/solarized">Solarized</a> themes by Ethan Schoonover (MIT License)
 </p>
 
+<h3>Fonts</h3>
+
+<p>The font used for the main novelWriter logo, mimetype and text banners is:</p>
+<p>
+  Pridi by Cadson Demak (Open Font License, Version 1.1)
+</p>
+
 <h3>Special Mentions</h3>
 
 <p>Additional thanks to <a href="https://github.com/johnblommers">@johnblommers</a> who was an early user and who has provided a lot
diff --git a/setup/macos/build.sh b/setup/macos/build.sh
index 15b19636..dbc9834e 100755
--- a/setup/macos/build.sh
+++ b/setup/macos/build.sh
@@ -62,6 +62,14 @@ fi
 echo "Content of current dir:"
 ls -lah .
 
+# Create icon
+echo "Creating icon ..."
+pushd "$SRC_DIR/setup/macos" || exit 1
+iconutil -c icns $SRC_DIR/setup/macos/novelwriter.iconset
+echo "Content of current dir:"
+ls -lah .
+
+popd || exit 1
 popd || exit 1
 pushd "$BUILD_DIR"/ || exit 1
 
@@ -111,8 +119,7 @@ for file in "${FILES_COPY[@]}"; do
     cp -R $SRC_DIR/$file novelWriter.app/Contents/Resources/novelWriter/
 done
 
-iconutil -c icns -o novelWriter.app/Contents/Resources/novelwriter.icns $SRC_DIR/setup/macos/novelwriter.iconset
-# cp $SRC_DIR/setup/macos/novelwriter.icns novelWriter.app/Contents/Resources/
+cp $SRC_DIR/setup/macos/novelwriter.icns novelWriter.app/Contents/Resources/
 
 # Create entry script
 echo "Creating entry script ..."