Merge jv
authorMerge Script
Sat, 02 Apr 2016 06:55:19 +0200
branchjv
changeset 3789 df7f675c8f9d
parent 3786 1a036255aa50 (current diff)
parent 3788 fabaae7a8428 (diff)
child 3791 a6e7bb83b1a8
Merge
--- a/Archiver.st	Sat Mar 26 06:44:23 2016 +0100
+++ b/Archiver.st	Sat Apr 02 06:55:19 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2003 by eXept Software AG
               All Rights Reserved
@@ -1247,6 +1249,7 @@
             ].
             ^ cmd
         ].
+        ^ 'winrar.exe'
     ].
     ^ nil
 
@@ -1380,7 +1383,7 @@
         template := '"%1" -Z -m -h "%2"'
     ].
     OperatingSystem isMSDOSlike ifTrue:[
-        cmd asFilename baseName = 'WinRAR.exe' ifTrue:[
+        (cmd asFilename baseName sameAs: 'WinRAR.exe') ifTrue:[
             headlessCmd := cmd asFilename directory construct:'rar.exe'.
             headlessCmd exists ifTrue:[
                 cmd := headlessCmd.
--- a/BackgroundPeriodicalJob.st	Sat Mar 26 06:44:23 2016 +0100
+++ b/BackgroundPeriodicalJob.st	Sat Apr 02 06:55:19 2016 +0200
@@ -74,7 +74,7 @@
     [
         job value.
         delay wait.
-    ] repeat.
+    ] loop.
 
     "Created: / 06-09-2011 / 12:01:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 21-02-2015 / 10:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -83,10 +83,10 @@
 !BackgroundPeriodicalJob class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundPeriodicalJob.st,v 1.3 2015-02-21 22:42:53 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundPeriodicalJob.st,v 1.3 2015-02-21 22:42:53 vrany Exp $'
+    ^ '$Header$'
 ! !