From c7630f11c896626a682f82342a2baa7aac45d1ff Mon Sep 17 00:00:00 2001
From: Rob van Son <R.J.J.H.vanSon@gmail.com>
Date: Wed, 11 Mar 2015 17:08:25 +0100
Subject: [PATCH] Corrected bug in Mac install scripts which could not handle
 spaces in paths

---
 addons/Mac_install.app/Contents/Info.plist            |  12 +++++++++---
 .../Contents/Resources/Scripts/Mac_install.command    |   3 ++-
 .../Contents/Resources/Scripts/main.scpt              | Bin 2154 -> 2258 bytes
 .../Contents/Resources/description.rtfd/TXT.rtf       |   2 +-
 addons/Mac_install.command                            |   3 ++-
 5 files changed, 14 insertions(+), 6 deletions(-)
 rewrite addons/Mac_install.app/Contents/Resources/Scripts/main.scpt (66%)

diff --git a/addons/Mac_install.app/Contents/Info.plist b/addons/Mac_install.app/Contents/Info.plist
index 1c9a94d..b401a0b 100644
--- a/addons/Mac_install.app/Contents/Info.plist
+++ b/addons/Mac_install.app/Contents/Info.plist
@@ -10,6 +10,8 @@
 	<string>applet</string>
 	<key>CFBundleIconFile</key>
 	<string>applet</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.ScriptEditor.id.CEA9E2FA-2203-4139-B59E-E67E8863628D</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -27,17 +29,21 @@
 	<true/>
 	<key>WindowState</key>
 	<dict>
+		<key>bundleDividerCollapsed</key>
+		<true/>
+		<key>bundlePositionOfDivider</key>
+		<real>0.0</real>
 		<key>dividerCollapsed</key>
 		<false/>
 		<key>eventLogLevel</key>
-		<integer>-1</integer>
+		<integer>2</integer>
 		<key>name</key>
 		<string>ScriptWindowState</string>
 		<key>positionOfDivider</key>
 		<real>333</real>
 		<key>savedFrame</key>
-		<string>100 159 1040 597 0 0 1280 778 </string>
-		<key>selectedTabView</key>
+		<string>624 443 1040 597 0 0 1920 1057 </string>
+		<key>selectedTab</key>
 		<string>result</string>
 	</dict>
 </dict>
diff --git a/addons/Mac_install.app/Contents/Resources/Scripts/Mac_install.command b/addons/Mac_install.app/Contents/Resources/Scripts/Mac_install.command
index 679453f..74123ba 100755
--- a/addons/Mac_install.app/Contents/Resources/Scripts/Mac_install.command
+++ b/addons/Mac_install.app/Contents/Resources/Scripts/Mac_install.command
@@ -3,7 +3,7 @@
 # Copy wordlists to SpeakGoodChinese preferences directory
 if [[ `uname` == "Darwin" ]] ; then 
 	APPLICATIONPATH=`dirname "$0"`
-	cd ${APPLICATIONPATH}
+	cd "${APPLICATIONPATH}"
 	if [[ ${APPLICATIONPATH} =~ "Mac_install.app/Contents/Resources/Scripts" ]]; then
 		cd ../../../../
 	fi
@@ -16,6 +16,7 @@ if [[ `uname` == "Darwin" ]] ; then
 		fi
 	fi
 	mkdir -p ~/Library/Preferences/SpeakGoodChinese2/wordlists
+	echo `pwd` >> ~/Desktop/kanweg.txt
 	cp -r wordlists/* ~/Library/Preferences/SpeakGoodChinese2/wordlists/
 	if [[ $? == 0 ]]; then
 		osascript -e 'tell app "Finder" to display dialog "Installation completed"'
diff --git a/addons/Mac_install.app/Contents/Resources/Scripts/main.scpt b/addons/Mac_install.app/Contents/Resources/Scripts/main.scpt
dissimilarity index 66%
index abb19cc5b984bdc4ae7fb4f14a4874e36ef488db..f31b2d0e286ea58dc38ee18f0e85258a99bfbdce 100644
GIT binary patch
delta 600
zcwRkF%T7~K6kYe+(&{Z2THBzpG-znSz8|z0C&mc_NBxF|z(9%Awu#_G|KWUqBZnsX
z55^g9DDT<_rHz_6a)N{9zQu3`>#V)9&tB{7AHH4x=Ya}@5auubv=N5+913?3(tlOP
zxT_Q9<Dz;6Ab<%>BVr2}IjMt~;K1SlE~{3rzP1s8u{!JvvhQVIubR)|QC`}J!d#J=
zlk#$gJzm(DxponSUCgp$v8&_m&=VW87@AFD3Xc%81%_r}OtEdTePb58Hk*{(EiYSQ
zmU`L&4E7wj02D8QF)_io4<_9FjyMuXBE_a51$<Jwc+NAP^2Fk~uDHU+nJ%fK>E)^Z
zpi=iwoCyhdd^|>)M?6FZSvD*lOLOR*jWmpxaLzPx3OR8bL0%y*B!D@EIUykw6beG3
zJWxDv;vG5h4xI=Y2ePoZ&pqzK&mC@a3lF);4H4zL)%tqH;-0X@`dZzRrhDn7a<#U+
ztUrzfjU6YjZE;%~Dz&wWms=7&A<E|eU0K|a-G&PdL}IP>$|zJfy0BmR+Dk4pO8swx
zWc0--ZkL2O_xPBs$oPVyA4Od0H|}-w0rL8{`@J{i=<|Neqodz?%0oSSE2RH;mV8aw
PLAkbAg#r7j+5GemV{f*@

delta 514
zcwQw?%}!H67(Fw$^y0l-dM}m4wrS9m0{w?3#;qF`uKEb3sjyI@P1^;me294f_ZSm>
z17i$pDA4kIDU{MiU7M(j<BZPY<b2<p@64I68+`LWPGmfRG=K2Bhcv8bkeEY4{gD+h
zuL{-^PrLyT$9+y*PSiVDP+zS1e1>BW8CY9dpTq(ddB>55#s3bv!&_uIba<;oBpu7*
zpG^`e-nhImHcusofZ&~h5g<7RX7w;)J}g9ejU_B&1vw6cF5v4r!YhWn<b}g4^*NFj
zp{mKpmdi_RSxR0Qhh^A4&ynXDPf<XTCl1fGIQ7;;9^w_uSwKmmq+gptS)!~-92JR*
zCMm2+tZI^BU$SrFotb#2CPKkL5%<{RF^>@NkX;_&5%(ST5OG?aou<QM%^IEUj-w?H
z${Y1odvo(eOZ}Rf6Ne_S=di0K&GvTF<$>9T<#1nbDpd`5f`_@m_0|mJFuQ(K`#LJF
z_iE$4?8_NU*Y*s?X7yUcC#(fn!%x+Z?x<Zmsb1R~ZqD?p0jda9XxBwWy|)wkCaN0K
T&;5b^dA;3eLBRVRh9CX{3Du_H

diff --git a/addons/Mac_install.app/Contents/Resources/description.rtfd/TXT.rtf b/addons/Mac_install.app/Contents/Resources/description.rtfd/TXT.rtf
index 33a7ca9..488d161 100644
--- a/addons/Mac_install.app/Contents/Resources/description.rtfd/TXT.rtf
+++ b/addons/Mac_install.app/Contents/Resources/description.rtfd/TXT.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl}
 {\colortbl;\red255\green255\blue255;}
 }
\ No newline at end of file
diff --git a/addons/Mac_install.command b/addons/Mac_install.command
index 679453f..74123ba 100755
--- a/addons/Mac_install.command
+++ b/addons/Mac_install.command
@@ -3,7 +3,7 @@
 # Copy wordlists to SpeakGoodChinese preferences directory
 if [[ `uname` == "Darwin" ]] ; then 
 	APPLICATIONPATH=`dirname "$0"`
-	cd ${APPLICATIONPATH}
+	cd "${APPLICATIONPATH}"
 	if [[ ${APPLICATIONPATH} =~ "Mac_install.app/Contents/Resources/Scripts" ]]; then
 		cd ../../../../
 	fi
@@ -16,6 +16,7 @@ if [[ `uname` == "Darwin" ]] ; then
 		fi
 	fi
 	mkdir -p ~/Library/Preferences/SpeakGoodChinese2/wordlists
+	echo `pwd` >> ~/Desktop/kanweg.txt
 	cp -r wordlists/* ~/Library/Preferences/SpeakGoodChinese2/wordlists/
 	if [[ $? == 0 ]]; then
 		osascript -e 'tell app "Finder" to display dialog "Installation completed"'
-- 
2.11.4.GIT