Skip to content

Commit 5073664

Browse files
committed
patchapp.applescript: added some exception handling
1 parent 2d4ca6a commit 5073664

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

Patch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fi
5252
export PATH=${TLPATH}:${PATH}
5353

5454
## get app's Resources directory
55-
TLRESDIR=$(cd $(dirname $0); pwd)
55+
TLRESDIR=$(cd $(dirname "$0"); pwd)
5656

5757
## flag to set up OS-bundled Hiragino fonts with Resources/cjk-gs-support
5858
with_cjkgssupport=${with_cjkgssupport:-1} ## default: 1 (true)
@@ -260,5 +260,5 @@ updmap-sys
260260
## TODO: remove mpost, upmpost from texmf.cnf in TLROOT
261261

262262
echo Finished
263-
exit
263+
exit 0
264264
## end of file

patchapp.applescript

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,40 @@ try
4848
set progress completed steps to i
4949

5050
--
51-
if progrMsg = "+ exit" then
51+
if progrMsg = "+ exit 0" then
5252
exit repeat
5353
else if progrMsg = "+ exit 1" then
5454
error number -128
5555
end if
5656
end repeat
57+
if progrMsg = "+ exit 0" then
58+
else if progrMsg = "cp: /Volumes/Bibunsho7-patch/ptex-fontmaps/maps/hiragino*: No such file or directory"
59+
error number -2
60+
else if progrMsg = "cjk-gs-integrate [DEBUG]: overwriting with the new one ..." then
61+
error number -1
62+
else
63+
error number -128
64+
end if
5765
-- quit
5866
set progress completed steps to n
5967
set progress additional description to "完了"
6068
activate
6169
display alert "完了"
6270
return
6371

64-
on error
65-
set progrMsg to do shell script "tail -n 2" & space & patchLog & space & "| fold"
72+
on error message number errn
6673
set progress additional description to progrMsg
67-
6874
activate
69-
display alert "失敗:ログファイル" & space & patchLog & space & "をご確認ください。"
75+
76+
set plzChkLog to "失敗:ログファイル" & space & patchLog & space & "をご確認ください。"
77+
78+
if errn = -2 then
79+
display alert plzChkLog & "複数個の Bibunsho7-patch-<バージョン>.dmg を開いています。"
80+
else if errn = -1 then
81+
display alert plzChkLog & "ターミナルで直接、 sudo " & quoted form of (POSIX path of (path to resource "Patch.sh")) & " を実行すると、成功するかもしれません。"
82+
else
83+
set progrMsg to do shell script "tail -n 2" & space & patchLog & space & "| fold"
84+
set progress additional description to progrMsg
85+
display alert plzChkLog
86+
end if
7087
end try

0 commit comments

Comments
 (0)