--- a/CVSSourceCodeManager.st	Thu Oct 04 17:10:33 2018 +0200
+++ b/CVSSourceCodeManager.st	Fri Oct 12 20:13:48 2018 +0200
@@ -1696,10 +1696,7 @@
     ].
 
     [
-        cmdOut := Filename newTemporary.
-        cmdOut exists ifTrue:[
-            cmdOut remove.
-        ].
+        cmdOut := FileStream newTemporary close; fileName.
 
         "/
         "/ in CVS, we have to checkout the file first, in order
@@ -2223,10 +2220,7 @@
         ].
     ].
 
-    cmdOut := Filename newTemporary.
-    cmdOut exists ifTrue:[
-        cmdOut remove.
-    ].
+    cmdOut := FileStream newTemporary close; fileName.
 
     "/
     "/ in CVS, we have to checkout the file first, in order
@@ -2924,10 +2918,7 @@
         cmd := 'checkout ', dirName.
         OperatingSystem isUNIXlike ifTrue:[
             "/ can redirect output
-            cmdOut := Filename newTemporary.
-            cmdOut exists ifTrue:[
-                cmdOut remove.
-            ].
+            cmdOut := FileStream newTemporary close; fileName.
             cmd := cmd , ' > ', '"'  , cmdOut name, '"' .
         ].
 
@@ -3454,10 +3445,7 @@
         ^ false.
     ].
 
-    cmdOut := Filename newTemporary.
-    cmdOut exists ifTrue:[
-        cmdOut remove.
-    ].
+    cmdOut := FileStream newTemporary close; fileName.
 
     packageDir isEmptyOrNil ifTrue:[
         fullName :=  moduleDir , '/' , fileName
@@ -3665,10 +3653,7 @@
     |fullName tempdir checkoutName cmdOut cmd tempFile idx aStream whatHappened l newRevision
      startIdx endIdx checkInDir logTmp s|
 
-    cmdOut := Filename newTemporary.
-    cmdOut exists ifTrue:[
-        cmdOut remove.
-    ].
+    cmdOut := FileStream newTemporary close; fileName.
 
     packageDir isEmptyOrNil ifTrue:[
         fullName :=  moduleDir , '/' , fileName
@@ -3843,10 +3828,7 @@
         ^ false
     ].
 
-    cmdOut := Filename newTemporary.
-    cmdOut exists ifTrue:[
-        cmdOut remove.
-    ].
+    cmdOut := FileStream newTemporary close; fileName.
 
     "/
     "/ create the module directory 
@@ -3909,10 +3891,7 @@
     "/
     tempdir := self createTempDirectory:packageDirName forModule:moduleDirName.
 
-    cmdOut := Filename newTemporary.
-    cmdOut exists ifTrue:[
-        cmdOut remove.
-    ].
+    cmdOut := FileStream newTemporary close; fileName.
 
     moduleDir := tempdir construct:moduleDirName.
     moduleDir isDirectory ifFalse:[
@@ -4318,10 +4297,7 @@
         tempFile remove.
     ].
 
-    cmdOut := Filename newTemporary.
-    cmdOut exists ifTrue:[
-        cmdOut remove.
-    ].
+    cmdOut := FileStream newTemporary close; fileName.
 
     cmd := 'remove ' , fileName , ' > ' , cmdOut name.
     (self 
@@ -5787,7 +5763,7 @@
         (cacheDir := self sourceCacheDirectory) isNil ifTrue:[
             ('CVSSourceCodeManager [warning]: no source cache directory') infoPrintCR.
         ] ifFalse:[
-            diffDir := (cacheDir / modulePath / '.diffs').
+            diffDir := cacheDir / modulePath / '.diffs'.
             diffDir exists ifFalse:[
                 diffDir makeDirectory.
             ].