From 8dfe472d0c2712426bc15848ecf4d473ef5bedd5 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Mon, 27 Jun 2022 18:40:58 +0200
Subject: [PATCH] (macOS) Improved Apple compliance for the Info.plist file.

---
 es-app/assets/EmulationStation-DE_Info.plist | 6 ++++++
 tools/update_version_string.sh               | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/es-app/assets/EmulationStation-DE_Info.plist b/es-app/assets/EmulationStation-DE_Info.plist
index 1801ca9f8..76406e21c 100644
--- a/es-app/assets/EmulationStation-DE_Info.plist
+++ b/es-app/assets/EmulationStation-DE_Info.plist
@@ -18,8 +18,14 @@
     <string>EmulationStation Desktop Edition</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>ESDE</string>
+    <key>CFBundleShortVersionString</key>
+    <string>2.0.0-alpha</string>
     <key>CFBundleVersion</key>
     <string>2.0.0-alpha</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.games</string>
     <key>LSMinimumSystemVersion</key>
diff --git a/tools/update_version_string.sh b/tools/update_version_string.sh
index dceb65885..40351beba 100755
--- a/tools/update_version_string.sh
+++ b/tools/update_version_string.sh
@@ -95,8 +95,10 @@ NEWSTRING="<string>EmulationStation Desktop Edition ${1}.${2}.${3}"
 cat $MODIFYFILE | sed s/"${MODIFYSTRING}"/"${NEWSTRING}"/ > $TEMPFILE
 mv $TEMPFILE $MODIFYFILE
 
-MODIFYSTRING=$(grep "<string>${OLDVERSION}" $MODIFYFILE)
+MODIFYSTRING=$(grep -m1 "<string>${OLDVERSION}" $MODIFYFILE)
 MODIFYSTRING=$(echo $MODIFYSTRING | sed s/".........$"//)
+# Adding the suffix is not fully compliant with the Apple documentation but seems to be working.
+# It's not used for the release builds anyway so it should hopefully not be an issue.
 NEWSTRING="<string>${1}.${2}.${3}${SUFFIX}"
 
 cat $MODIFYFILE | sed s/"${MODIFYSTRING}"/"${NEWSTRING}"/ > $TEMPFILE