--- a/CVSSourceCodeManager.st	Wed Jun 01 15:01:21 2016 +0200
+++ b/CVSSourceCodeManager.st	Fri Jun 03 11:44:41 2016 +0200
@@ -223,12 +223,18 @@
      is set, check if cvs commands can be executed and install myself as the
      SourceCodeManager if this works out ok"
 
-    | s f top cvsCmd |
-
-    CVSCommandSemaphore := (Semaphore new:10) name:'Concurrent CVS Commands'.    "/ at most 10 cvs activities concurrently
-    CVSCommitOptions := ''.
-    CVSUpdateOptions := ''.
-    RemoteCVS := true.
+    | s f top |
+
+    CVSCommandSemaphore isNil ifTrue:[
+        CVSCommandSemaphore := (Semaphore new:10) name:'Concurrent CVS Commands'.    "/ at most 10 cvs activities concurrently
+    ].
+    CVSCommitOptions isNil ifTrue:[
+        CVSCommitOptions := ''.
+        CVSUpdateOptions := ''.
+    ].
+    RemoteCVS isNil ifTrue:[
+        RemoteCVS := true.
+    ].
     DisabledModules := nil.
     CVSModuleRoots isNil ifTrue:[
         CVSModuleRoots := Dictionary new.
@@ -247,14 +253,6 @@
         ].
     ].
 
-    cvsCmd := self cvsExecutable.
-
-"/    ok := OperatingSystem canExecuteCommand:cvsCmd.
-"/    ok ifFalse:[
-"/        'CVSSourceCodeManager [warning]: disabled because no >>cvs<< command was found' infoPrintCR.
-"/        ^ self
-"/    ].
-
     UseWorkTree := false.
 
     "/
@@ -266,7 +264,6 @@
         RemoteCVS := false
     ].
 
-"/    Smalltalk at:#SourceCodeManager put:self.
     DefaultManager isNil ifTrue:[
         DefaultManager := self.    
     ].