--- a/STXInstaller.st	Thu Oct 18 18:50:46 2001 +0200
+++ b/STXInstaller.st	Tue Oct 23 12:01:51 2001 +0200
@@ -453,7 +453,7 @@
         commandTraceView endEntry.
         cmd := cmd , ' 2>&1' .
 
-        self executeCommandAndShowOutput:cmd.
+        self executeCommandAndShowOutput:cmd emphasize:false.
 
         ^ true
     ].
@@ -659,32 +659,32 @@
     installWhat == #full ifTrue:[
         commandTraceView showCR:(resources string:'setting up symbolic links in doc ...'); endEntry.
         OperatingSystem executeCommand:('(cd ' , fullDir , '/doc/online ; make links)').
-    ] ifFalse:[
+        ^ self.
+    ].
 "/        OperatingSystem executeCommand:('(cd ' , stxLibDir , '/doc/online ; make links)').
 
-        commandTraceView showCR:(resources string:'setting up symbolic links in lib ...'); endEntry.
+    commandTraceView showCR:(resources string:'setting up symbolic links in lib ...'); endEntry.
 
-        #(
-            'libbasic/libbasic.so'
-            'libbasic2/libbasic2.so'
-            'libbasic3/libbasic3.so'
-            'libcomp/libcomp.so'
-            'libboss/libboss.so'
-            'libview/*.so'
-            'libview2/libview2.so'
-            'libwidg/libwidg.so'
-            'libwidg2/libwidg2.so'
-            'libwidg3/libwidg3.so'
-            'libhtml/libhtml.so'
-            'libui/libui.so'
-            'libtool/libtool.so'
-            'libtool2/libtool2.so'
-            'goodies/persistency/libdbase.so'
-        ) do:[:src |  |cmd|
-            cmd := '(cd ' , stxLibDir , '/lib ; ln -s ../../packages/stx/' , src , ' . )'.
-            commandTraceView showCR:cmd; endEntry.
-            OperatingSystem executeCommand:cmd.
-        ].
+    #(
+        'libbasic/libbasic.so'
+        'libbasic2/libbasic2.so'
+        'libbasic3/libbasic3.so'
+        'libcomp/libcomp.so'
+        'libboss/libboss.so'
+        'libview/*.so'
+        'libview2/libview2.so'
+        'libwidg/libwidg.so'
+        'libwidg2/libwidg2.so'
+        'libwidg3/libwidg3.so'
+        'libhtml/libhtml.so'
+        'libui/libui.so'
+        'libtool/libtool.so'
+        'libtool2/libtool2.so'
+        'goodies/persistency/libdbase.so'
+    ) do:[:src |  |cmd|
+        cmd := '(cd ' , stxLibDir , '/lib ; ln -s ../../packages/stx/' , src , ' . )'.
+        commandTraceView showCR:cmd; endEntry.
+        OperatingSystem executeCommand:cmd.
     ].
 
     installDocFiles ifTrue:[
@@ -730,6 +730,10 @@
 !
 
 executeCommandAndShowOutput:cmd
+    ^ self executeCommandAndShowOutput:cmd emphasize:true
+!
+
+executeCommandAndShowOutput:cmd emphasize:doEmphasize
     |doneSemaphore line p|
 
     OperatingSystem isMSWINDOWSlike ifTrue:[
@@ -749,7 +753,10 @@
                     (p readWaitWithTimeout:0.1) ifFalse:[
                         line := p nextLine.
                         (line notNil and:[line notEmpty]) ifTrue:[
-                            commandTraceView showCR:(('  ' , line) asText emphasizeAllWith:(#color->Color red)).
+                            doEmphasize ifTrue:[
+                                line := line asText emphasizeAllWith:(#color->Color red).
+                            ].
+                            commandTraceView showCR:('  ' , line).
                             commandTraceView endEntry.
                         ]
                     ]
@@ -1028,6 +1035,10 @@
 
     l := d addTextLabel:(resources string:'Smalltalk/X CD installation (full).').
     l adjust:#left; backgroundColor:dark; foregroundColor:Color white.
+
+    l := d addTextLabel:(resources string:'\Notice: this simply copies all of the CD to the destination directory below.\If any problem is encountered, manually copy the CD to your harddisk.') withCRs.
+    l adjust:#left; backgroundColor:dark; foregroundColor:Color white.
+
     d addVerticalSpace.
     d addVerticalSpace.
 
@@ -1296,7 +1307,8 @@
 !
 
 askForFullInstallation
-    "open a dialog to enter destination directories"
+    "open a dialog to ask if a full installation is wanted;
+     Leave the result in installWhat (a symbol, either #full or #partial)."
 
     |d cm l green dark img|