From c9d0f568081e65c84e0329c8266ca4233de79a74 Mon Sep 17 00:00:00 2001
From: Youssef Abou-Kewik <yadnan@digipalms.com>
Date: Mon, 30 Sep 2019 17:35:09 -0700
Subject: [PATCH] Prepare for release

---
 osx/build_app.sh | 20 ++++++++++++++++----
 osx/conf.py      |  3 ---
 setup_py2app.py  |  5 +++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/osx/build_app.sh b/osx/build_app.sh
index 3189585e5..f7028c7a5 100755
--- a/osx/build_app.sh
+++ b/osx/build_app.sh
@@ -1,4 +1,16 @@
-#!/bin/sh
+#!/bin/bash
+
+set -o nounset
+set -o errexit
+set -o functrace
+
+trap "exit" INT
+failure() {
+  local lineno=$1
+  local msg=$2
+  echo "Failed at $lineno: $msg"
+}
+trap 'failure ${LINENO} "$BASH_COMMAND"' ERR
 
 export PATH=$HOME/.new_local/bin:$HOME/gtk/inst/bin:$PATH
 
@@ -52,7 +64,7 @@ cp $INSTROOT/share/themes/Mac/gtk-3.0/gtk-keys.css $RES/share/themes/Meld-Mojave
 cp $INSTROOT/share/themes/Mac/gtk-3.0/gtk-keys.css $RES/share/themes/Meld-Mojave-light/gtk-3.0/gtk-keys.css
 
 # meld specific resources
-mkdir $RES/share/meld
+mkdir -p $RES/share/meld
 rsync -r -t data/icons/* $RES/share/icons
 rsync -r -t data/meld.css $RES/share/meld
 rsync -r -t data/styles/meld-dark.xml $RES/share/gtksourceview-4/styles
@@ -70,9 +82,9 @@ rm -fr $RES/share/icons/Adwaita/96x96
 
 # copy fontconfig configuration files
 mkdir -p $RES/etc/fontconfig/conf.d
-cp $INSTROOT/etc/fonts/fonts.conf $RES/etc/fontconfig
+[ -f $INSTROOT/etc/fonts/fonts.conf ] && cp $INSTROOT/etc/fonts/fonts.conf $RES/etc/fontconfig
 for i in $(find $INSTROOT/etc/fonts/conf.d); do
-  cp $INSTROOT/share/fontconfig/conf.avail/$(basename $i) $RES/etc/fontconfig/conf.d
+  cp $INSTROOT/share/fontconfig/conf.avail/$(basename $i) $RES/etc/fontconfig/conf.d || true
 done
 
 # copy main libraries
diff --git a/osx/conf.py b/osx/conf.py
index f502397d2..c4a8e1d37 100644
--- a/osx/conf.py
+++ b/osx/conf.py
@@ -86,9 +86,6 @@ def frozen():
 
 
 def uninstalled():
-    # Always use frozen when building...
-    return frozen()
-
     global DATADIR, LOCALEDIR, DATADIR_IS_UNINSTALLED
 
     melddir = Path(__file__).resolve().parent.parent
diff --git a/setup_py2app.py b/setup_py2app.py
index f7dc8a268..15d9cdf93 100644
--- a/setup_py2app.py
+++ b/setup_py2app.py
@@ -59,7 +59,7 @@
     'lib/girepository-1.0',
     'share/fontconfig',
     'share/glib-2.0',
-    'share/gtksourceview-3.0',
+    'share/gtksourceview-4',
     #'share/icons',
 ]
 
@@ -122,7 +122,8 @@
                     'libgobject-2.0.0.dylib'
                     'libgtk-3.0.dylib'
                     'libgtkmacintegration-gtk3.2.dylib'
-                    'libgtksourceview-3.0.1.dylib'
+                    'libgtksourceview-4.dylib'
+                    'libgtksourceview-4.0.dylib'
                     'libharfbuzz.0.dylib'
                     'libpango-1.0.0.dylib'
                     'libpangocairo-1.0.0.dylib'