# HG changeset patch # User Claus Gittinger # Date 864306433 -7200 # Node ID 45af2b7a5ecad7681a58aa2b58b6f46b6f8ea943 # Parent 61628bedc85a05b7f959f37f8b810ba4a7c08019 checkin from browser diff -r 61628bedc85a -r 45af2b7a5eca STXInstaller.st --- a/STXInstaller.st Thu May 22 13:41:44 1997 +0200 +++ b/STXInstaller.st Thu May 22 15:07:13 1997 +0200 @@ -281,11 +281,13 @@ ((fileName includes:$*) not and:[('../../' , fileName) asFilename exists not]) ifTrue:[ (self listOfOptionalPackages includes:fileName) ifFalse:[ - commandTraceView showCR:('cannot copy ' , fileName , ' - not included in distribution') + commandTraceView showCR:('cannot copy ' , fileName , ' - not included in distribution'). + commandTraceView endEntry. ] ] ifFalse:[ cmd := 'cp -r ../../' , fileName , ' ' , destDir. commandTraceView showCR:cmd , ' ...'. + commandTraceView endEntry. cmd := cmd , ' 2>&1' . doneSemaphore := Semaphore new. @@ -301,6 +303,7 @@ line := p nextLine. (line notNil and:[line notEmpty]) ifTrue:[ commandTraceView showCR:((' ' , line) asText emphasizeAllWith:(#color->Color red)). + commandTraceView endEntry. ] ] ]. @@ -319,7 +322,7 @@ ^ true "Created: 17.7.1996 / 15:16:20 / cg" - "Modified: 2.3.1997 / 12:43:47 / cg" + "Modified: 22.5.1997 / 15:06:33 / cg" ! createDirectories @@ -344,6 +347,7 @@ d := dirName asFilename. commandTraceView showCR:(resources string:'creating %1 ...' with:d pathName). + commandTraceView endEntry. d exists ifFalse:[ OperatingSystem recursiveCreateDirectory:d pathName @@ -380,7 +384,7 @@ ^ true "Created: 17.7.1996 / 15:24:19 / cg" - "Modified: 18.7.1996 / 22:18:38 / cg" + "Modified: 22.5.1997 / 15:06:41 / cg" ! createSymbolicLinks @@ -389,11 +393,12 @@ msg := (resources array:#('ST/X Installation' '' 'creating symbolic links' '' '' '')) asStringCollection. commandTraceView showCR:(resources string:'setting up symbolic links in doc/online ...'). + commandTraceView endEntry. OperatingSystem executeCommand:('(cd ' , stxLibDir , '/doc/online ; make links)'). ^ true "Created: 17.7.1996 / 15:24:19 / cg" - "Modified: 18.7.1996 / 22:18:38 / cg" + "Modified: 22.5.1997 / 15:06:48 / cg" ! outputInitialMessage @@ -555,7 +560,7 @@ cm list:self defaultLibDirs. d addLabelledField:cm - label:(resources string:'help files') + label:(resources string:'other files') adjust:#left tabable:true from:0.0 to:1.0 separateAtX:0.25 @@ -626,7 +631,7 @@ d destroy. ^ false - "Modified: 2.3.1997 / 13:40:44 / cg" + "Modified: 22.5.1997 / 15:04:29 / cg" ! checkForExistingInstallationAndConfirm