Merge pull request #9 from munepi/add_exception_handling

Add exception handling

Author: munepi

Patch.sh

@@ -52,7 +52,7 @@ fi
 export PATH=${TLPATH}:${PATH}
 
 ## get app's Resources directory
-TLRESDIR=$(cd $(dirname $0); pwd)
+TLRESDIR=$(cd $(dirname "$0"); pwd)
 
 ## flag to set up OS-bundled Hiragino fonts with Resources/cjk-gs-support
 with_cjkgssupport=${with_cjkgssupport:-1} ## default: 1 (true)
@@ -260,5 +260,5 @@ updmap-sys
 ## TODO: remove mpost, upmpost from texmf.cnf in TLROOT
 
 echo Finished
-exit
+exit 0
 ## end of file

patchapp.applescript

@@ -22,8 +22,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-set n to 330 -- 308 /tmp/bibunsho7-patch.log
-set progress total steps to n
+-- 700 lines /tmp/bibunsho7-patch.log => 3.5min
+set progressTimeout to 5 -- minutes
+set progressMaxN to (progressTimeout * 60 * 10)
+set progress total steps to progressMaxN
 set progress description to "Patch.app: 実行中..."
 set progress additional description to "待機中..."
 
@@ -37,34 +39,54 @@ try
     -- activate the progress bar intentionally
     activate
 
-    repeat with i from 1 to n
+    repeat with i from 1 to progressMaxN
         delay 0.1
-
         -- update progress description and completed steps
         set progrMsg to do shell script "tail -n 1" & space & patchLog & space & "| fold"
         set progress additional description to progrMsg
         set i to do shell script "wc -l" & space & patchLog & space & "| sed \"s, *,,\" | cut -f1 -d \" \""
 
-        set progress completed steps to i
+        set progress completed steps to (i * progressTimeout)
+
+        if progrMsg = "cjk-gs-integrate [DEBUG]: overwriting with the new one ..."
+            set progress description to "Patch.app: 実行中... (この処理にしばらく時間がかかる場合があります)"
+        else
+            set progress description to "Patch.app: 実行中..."
+        end if
 
         --
-        if progrMsg = "+ exit" then
+        if progrMsg = "+ exit 0" then
             exit repeat
         else if progrMsg = "+ exit 1" then
             error number -128
         end if
     end repeat
+    -- some exception handling
+    if progrMsg = "+ exit 0" then
+    else if progrMsg = "cp: /Volumes/Bibunsho7-patch/ptex-fontmaps/maps/hiragino*: No such file or directory"
+        error number -2
+    else
+        error number -128
+    end if
+
     -- quit
-    set progress completed steps to n
+    set progress completed steps to progressMaxN
     set progress additional description to "完了"
     activate
     display alert "完了"
     return
 
-on error
-    set progrMsg to do shell script "tail -n 2" & space & patchLog & space & "| fold"
+on error message number errn
     set progress additional description to progrMsg
-
     activate
-    display alert "失敗：ログファイル" & space & patchLog & space & "をご確認ください。"
+
+    set plzChkLog to "失敗：ログファイル" & space & patchLog & space & "をご確認ください。"
+
+    if errn = -2 then
+        display alert plzChkLog & "複数個の Bibunsho7-patch-<バージョン>.dmg を開いています。"
+    else
+        set progrMsg to do shell script "tail -n 2" & space & patchLog & space & "| fold"
+        set progress additional description to progrMsg
+        display alert plzChkLog
+    end if
 end try