--- a/STXInstaller.st Thu Dec 23 17:29:22 1999 +0100
+++ b/STXInstaller.st Thu Dec 23 22:43:20 1999 +0100
@@ -623,6 +623,11 @@
release := self smalltalkRelease.
k := Win32OperatingSystem::RegistryEntry key:'HKEY_LOCAL_MACHINE\Software'.
+ k isNil ifTrue:[
+ self warn:'cannot update registry under HKEY_LOCAL_MACHINE\Software\eXept'.
+ ^ self.
+ ].
+
k := k createSubKeyNamed:'eXept'.
k := k createSubKeyNamed:'Smalltalk/X'.
k valueNamed:'CurrentVersion' put:release.
@@ -633,7 +638,7 @@
k valueNamed:'DocDir' put:stxDocDir.
k valueNamed:'PackageDirPath' put:stxPkgDir.
- "Modified: / 31.5.1999 / 15:24:41 / cg"
+ "Modified: / 23.12.1999 / 22:21:18 / cg"
!
createSymbolicLinks
@@ -773,10 +778,11 @@
!
recursiveCopy:src to:dst print:doPrint
- |cmd srcF dstF d|
+ |cmd srcBaseName srcF dstF d|
srcF := src asFilename.
dstF := dst asFilename.
+
"/ OperatingSystem isUNIXlike ifTrue:[
"/ cmd := 'cp -r ' , src , ' ' , destDir.
"/ commandTraceView showCR:cmd , ' ...'.
@@ -785,11 +791,16 @@
"/
"/ self executeCommandAndShowOutput:cmd
"/ ] ifFalse:[
+ srcBaseName := srcF baseName.
+ (srcBaseName startsWith:'.#') ifTrue:[^ self].
+
(#(
'CVS'
'not_delivered'
- ) includes:srcF baseName) ifFalse:[
- srcF baseName includesMatchCharacters ifTrue:[
+ '.cvsignore'
+ '.dir.info'
+ ) includes:srcBaseName) ifFalse:[
+ srcBaseName includesMatchCharacters ifTrue:[
doPrint ifTrue:[
OperatingSystem isUNIXlike ifTrue:[
commandTraceView showCR:('cp ' , srcF pathName , ' ' , dstF pathName).
@@ -799,7 +810,7 @@
commandTraceView endEntry.
].
srcF directory directoryContents do:[:fileName |
- ((srcF baseName) match:fileName) ifTrue:[
+ (srcBaseName match:fileName) ifTrue:[
(#(
'CVS'
'not_delivered'
@@ -822,7 +833,7 @@
].
srcF isDirectory ifFalse:[
(dstF exists and:[dstF isDirectory]) ifTrue:[
- dstF := dstF construct:srcF baseName.
+ dstF := dstF construct:srcBaseName.
].
srcF copyTo:dstF.
OperatingSystem isUNIXlike ifTrue:[
@@ -831,7 +842,7 @@
]
]
] ifTrue:[
- d := dstF asFilename construct:srcF baseName.
+ d := dstF asFilename construct:srcBaseName.
(d exists) ifFalse:[
d makeDirectory.
].
@@ -846,7 +857,7 @@
"/ ]
"Created: / 31.5.1999 / 13:05:09 / cg"
- "Modified: / 31.5.1999 / 13:14:19 / cg"
+ "Modified: / 23.12.1999 / 22:07:41 / cg"
! !
!STXInstaller methodsFor:'startup'!