From 7f77f9b470424d118d4db9d079a82e5874c6613c Mon Sep 17 00:00:00 2001
From: D-a-n-i-l-o <D-a-n-i-l-o@users.noreply.github.com>
Date: Sun, 14 Apr 2019 05:15:27 +0200
Subject: [PATCH 1/3] macOS only: Added info.plist and Monkey2logo.icns to
 Ted2go binary, so the icon appears in the macOS dock. Delete
 bin/ted2_macos.app and run rebuildted2go.sh to apply.

---
 scripts/rebuildted2go.sh       |  3 +++
 scripts/updateted2go-github.sh |  3 +++
 scripts/updateted2go.sh        |  3 +++
 src/ted2go/info.plist          | 12 ++++++++++++
 4 files changed, 21 insertions(+)
 create mode 100644 src/ted2go/info.plist

diff --git a/scripts/rebuildted2go.sh b/scripts/rebuildted2go.sh
index 94556ddb0..9a6c18a2c 100755
--- a/scripts/rebuildted2go.sh
+++ b/scripts/rebuildted2go.sh
@@ -35,6 +35,9 @@ else
 
 	rm -r -f $ted2
 	cp -R ./ted2go.products/macos/ted2.app $ted2
+
+	cp ../src/ted2go/info.plist "$ted2/Contents"
+	cp ../src/launcher/Monkey2logo.icns "$ted2/Contents/Resources"
 	
 	rm -r -f "$launcher"
 	cp -R ./launcher.products/macos/Launcher.app "$launcher"
diff --git a/scripts/updateted2go-github.sh b/scripts/updateted2go-github.sh
index f06ae900b..756c84c30 100755
--- a/scripts/updateted2go-github.sh
+++ b/scripts/updateted2go-github.sh
@@ -35,6 +35,9 @@ else
 
 	rm -r -f $ted2
 	cp -R ./ted2go-github.products/macos/ted2.app $ted2
+
+	cp ../src/ted2go/info.plist "$ted2/Contents"
+	cp ../src/launcher/Monkey2logo.icns "$ted2/Contents/Resources"
 	
 	rm -r -f "$launcher"
 	cp -R ./launcher.products/macos/Launcher.app "$launcher"
diff --git a/scripts/updateted2go.sh b/scripts/updateted2go.sh
index 6fc27acaf..8fdd6ac1f 100755
--- a/scripts/updateted2go.sh
+++ b/scripts/updateted2go.sh
@@ -35,6 +35,9 @@ else
 
 	rm -r -f $ted2
 	cp -R ./ted2go.products/macos/ted2.app $ted2
+
+	cp ../src/ted2go/info.plist "$ted2/Contents"
+	cp ../src/launcher/Monkey2logo.icns "$ted2/Contents/Resources"
 	
 	rm -r -f "$launcher"
 	cp -R ./launcher.products/macos/Launcher.app "$launcher"
diff --git a/src/ted2go/info.plist b/src/ted2go/info.plist
new file mode 100644
index 000000000..2ac062512
--- /dev/null
+++ b/src/ted2go/info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>Ted2go</string>
+	<key>CFBundleIconFile</key>
+	<string>Monkey2logo</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+</dict>
+</plist>

From 9cc6527e328a3549aed65abe0b1a22b980070cde Mon Sep 17 00:00:00 2001
From: D-a-n-i-l-o <D-a-n-i-l-o@users.noreply.github.com>
Date: Sun, 14 Apr 2019 05:40:53 +0200
Subject: [PATCH 2/3] Changed all "source common.sh" in scripts to ".
 ./common.sh" for greatest compatibility with different shells. For example
 Ubuntu uses 'dash' instead of 'bash' by default and some shells do not know
 the newer 'source' command, resulting in a script error at the 'source'
 command.

---
 scripts/makedocs.sh            | 2 +-
 scripts/rebuildmods.sh         | 2 +-
 scripts/rebuildmx2cc.sh        | 2 +-
 scripts/rebuildted2go.sh       | 2 +-
 scripts/updatemods.sh          | 2 +-
 scripts/updatemx2cc.sh         | 2 +-
 scripts/updateted2go-github.sh | 2 +-
 scripts/updateted2go.sh        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/makedocs.sh b/scripts/makedocs.sh
index 6d3637ee6..a464a91cc 100755
--- a/scripts/makedocs.sh
+++ b/scripts/makedocs.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 $mx2cc makedocs
 
diff --git a/scripts/rebuildmods.sh b/scripts/rebuildmods.sh
index aae3d66a0..61f07c77b 100755
--- a/scripts/rebuildmods.sh
+++ b/scripts/rebuildmods.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 echo ""
 echo "***** Rebuilding modules *****"
diff --git a/scripts/rebuildmx2cc.sh b/scripts/rebuildmx2cc.sh
index 20feaac78..fca20792b 100755
--- a/scripts/rebuildmx2cc.sh
+++ b/scripts/rebuildmx2cc.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 echo ""
 echo "***** Rebuilding mx2cc *****"
diff --git a/scripts/rebuildted2go.sh b/scripts/rebuildted2go.sh
index 9a6c18a2c..77f0a7c88 100755
--- a/scripts/rebuildted2go.sh
+++ b/scripts/rebuildted2go.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 echo ""
 echo "***** Rebuilding ted2go *****"
diff --git a/scripts/updatemods.sh b/scripts/updatemods.sh
index d944ee527..2041c1129 100755
--- a/scripts/updatemods.sh
+++ b/scripts/updatemods.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 echo ""
 echo "***** Updating modules *****"
diff --git a/scripts/updatemx2cc.sh b/scripts/updatemx2cc.sh
index bcf7a3602..2c87dae2c 100755
--- a/scripts/updatemx2cc.sh
+++ b/scripts/updatemx2cc.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 echo ""
 echo "***** Updating mx2cc *****"
diff --git a/scripts/updateted2go-github.sh b/scripts/updateted2go-github.sh
index 756c84c30..23d0fd74c 100755
--- a/scripts/updateted2go-github.sh
+++ b/scripts/updateted2go-github.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 echo ""
 echo "***** Updating ted2go *****"
diff --git a/scripts/updateted2go.sh b/scripts/updateted2go.sh
index 8fdd6ac1f..5be5e7461 100755
--- a/scripts/updateted2go.sh
+++ b/scripts/updateted2go.sh
@@ -1,5 +1,5 @@
 
-source common.sh
+. ./common.sh
 
 echo ""
 echo "***** Updating ted2go *****"

From 4457e22a8f94a9332c15232bfb7ebd4c5fa73f36 Mon Sep 17 00:00:00 2001
From: D-a-n-i-l-o <D-a-n-i-l-o@users.noreply.github.com>
Date: Sun, 14 Apr 2019 07:32:58 +0200
Subject: [PATCH 3/3] Fixed info.plist

---
 src/ted2go/info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ted2go/info.plist b/src/ted2go/info.plist
index 2ac062512..e64fef96d 100644
--- a/src/ted2go/info.plist
+++ b/src/ted2go/info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleExecutable</key>
-	<string>Ted2go</string>
+	<string>ted2</string>
 	<key>CFBundleIconFile</key>
 	<string>Monkey2logo</string>
 	<key>CFBundlePackageType</key>