--- a/STXInstaller.st	Fri Oct 26 15:54:25 2001 +0200
+++ b/STXInstaller.st	Fri Oct 26 16:05:29 2001 +0200
@@ -840,86 +840,79 @@
     srcF := src asFilename.
     dstF := dst asFilename.
 
-"/    OperatingSystem isUNIXlike ifTrue:[
-"/        cmd := 'cp -r ' , src , ' ' , destDir.
-"/        commandTraceView showCR:cmd , ' ...'.
-"/        commandTraceView endEntry.
-"/        cmd := cmd , ' 2>&1' .
-"/
-"/        self executeCommandAndShowOutput:cmd
-"/    ] ifFalse:[
-        srcBaseName := srcF baseName.
-        (srcBaseName startsWith:'.#') ifTrue:[^ self].
+    srcBaseName := srcF baseName.
+    (srcBaseName startsWith:'.#') ifTrue:[^ self].
+
+    (#(
+        'CVS'
+        'not_delivered'
+        '.cvsignore'
+        '.dir.info'
+    ) includes:srcBaseName) ifTrue:[
+        ^ self
+    ].
 
-        (#(
-            'CVS'
-            'not_delivered'
-            '.cvsignore'
-            '.dir.info'
-        ) includes:srcBaseName) ifFalse:[
-            srcBaseName includesMatchCharacters ifTrue:[
-                doPrint ifTrue:[
-                    OperatingSystem isUNIXlike ifTrue:[
-                        commandTraceView showCR:('cp ' , srcF pathName , ' ' , dstF pathName).
-                    ] ifFalse:[
-                        commandTraceView showCR:('copy ' , srcF pathName , ' ' , dstF pathName).
-                    ].
-                    commandTraceView endEntry.
-                ].
-                (srcF directory directoryContents ? #()) do:[:fileName |
-                    (srcBaseName match:fileName) ifTrue:[
-                        (#(
-                            'CVS'
-                            'not_delivered'
-                        ) includes:fileName) ifFalse:[
-                            self 
-                                recursiveCopy:(srcF directory construct:fileName) 
-                                to:dstF
-                                print:false
-                        ]
-                    ]
-                ]
+    srcBaseName includesMatchCharacters ifTrue:[
+        doPrint ifTrue:[
+            OperatingSystem isUNIXlike ifTrue:[
+                commandTraceView showCR:('cp ' , srcF pathName , ' ' , dstF pathName).
             ] ifFalse:[
-                doPrint ifTrue:[
-                    OperatingSystem isUNIXlike ifTrue:[
-                        commandTraceView showCR:('cp ' , srcF pathName , ' ' , dstF pathName).
-                    ] ifFalse:[
-                        commandTraceView showCR:('copy ' , srcF pathName , ' ' , dstF pathName).
-                    ].
-                    commandTraceView endEntry.
-                ].
-                srcF isDirectory ifFalse:[
-                    (dstF exists and:[dstF isDirectory]) ifTrue:[
-                        dstF := dstF construct:srcBaseName.
-                    ].
-                    "/ special check for windows bug
-                    "/ (lists trans.tbl files, but wont find it later)
-                    srcF exists ifTrue:[
-                        Object errorSignal handle:[:ex |
-                            commandTraceView showCR:('*** Error: ' , ex errorString)
-                        ] do:[
-                            srcF copyTo:dstF.
-                        ]
-                    ].
-                    OperatingSystem isUNIXlike ifTrue:[
-                        srcF isExecutable ifTrue:[
-                            dstF makeExecutableForAll
-                        ]
-                    ]
-                ] ifTrue:[
-                    d := dstF asFilename construct:srcBaseName.
-                    (d exists) ifFalse:[
-                        d makeDirectory.
-                    ].
-                    (srcF directoryContents ? #()) do:[:fileName |
-                        self recursiveCopy:(srcF construct:fileName) 
-                             to:d
-                             print:false
-                    ]
+                commandTraceView showCR:('copy ' , srcF pathName , ' ' , dstF pathName).
+            ].
+            commandTraceView endEntry.
+        ].
+        (srcF directory directoryContents ? #()) do:[:fileName |
+            (srcBaseName match:fileName) ifTrue:[
+                (#(
+                    'CVS'
+                    'not_delivered'
+                ) includes:fileName) ifFalse:[
+                    self 
+                        recursiveCopy:(srcF directory construct:fileName) 
+                        to:dstF
+                        print:doPrint
                 ]
             ]
         ]
-"/    ]
+    ] ifFalse:[
+        srcF isDirectory ifFalse:[
+            (dstF exists and:[dstF isDirectory]) ifTrue:[
+                dstF := dstF construct:srcBaseName.
+            ].
+            "/ special check for windows bug
+            "/ (lists trans.tbl files, but wont find it later)
+            srcF exists ifTrue:[
+                Object errorSignal handle:[:ex |
+                    commandTraceView showCR:('*** Error: ' , ex errorString)
+                ] do:[
+                    srcF copyTo:dstF.
+                ]
+            ].
+            OperatingSystem isUNIXlike ifTrue:[
+                srcF isExecutable ifTrue:[
+                    dstF makeExecutableForAll
+                ]
+            ]
+        ] ifTrue:[
+            doPrint ifTrue:[
+                OperatingSystem isUNIXlike ifTrue:[
+                    commandTraceView showCR:('cp ' , srcF pathName , ' ' , dstF pathName).
+                ] ifFalse:[
+                    commandTraceView showCR:('copy ' , srcF pathName , ' ' , dstF pathName).
+                ].
+                commandTraceView endEntry.
+            ].
+            d := dstF asFilename construct:srcBaseName.
+            (d exists) ifFalse:[
+                d makeDirectory.
+            ].
+            (srcF directoryContents ? #()) do:[:fileName |
+                self recursiveCopy:(srcF construct:fileName) 
+                     to:d
+                     print:doPrint
+            ]
+        ]
+    ]
 
     "Created: / 31.5.1999 / 13:05:09 / cg"
     "Modified: / 3.3.2000 / 01:51:54 / cg"