Ticket #156: InstallPath.patch

Source/InstallFromWorkspace.cobra

@@ -114 +114 @@
         print
         print 'Working...'
         print
+        .verifyInstallDirectory
         .verifyInWorkspace
         .verifyVirtualMachineVersion
         .locateSnapshotCompiler
@@ -208 +209 @@
             print 'found dir:', dir
         else
             print 'make dir :', dir
-            Directory.createDirectory(dir)
+            try
+                Directory.createDirectory(dir)
+            catch ex as SystemException
+                .error('Unable to create installation directory.\n[ex.message]\nCannot proceed.\nPut the install path into a file called "installDirectory".')
 
     def startStage(description as String)
         print '====', description
@@ -283 +287 @@
 
     ## Stages
 
+    def verifyInstallDirectory
+        .startStage('Verify installation directory')
+        default = if(.isRunningOnUnix, .installDirectories[1], .installDirectories[0])
+        if File.exists('installDirectory')
+            # get install directory from first line of the file
+            useDir = File.openText('installDirectory').readLine
+            if useDir, default = useDir
+        # TODO: prompt the user for the location
+        .requireDir(default)
+        _baseDir = default  
+
     def verifyInWorkspace
         .startStage('Verify running in workspace')
         msg = 'The current directory does not appear to be a workspace. This program is for installing from the workspace.'
@@ -453 +468 @@
         print
 
     def copyFilesToInstallDirectory
-        .startStage('Copy files to install directory')
-        slash = .slash
-        default = if(.isRunningOnUnix, .installDirectories[1], .installDirectories[0])
-        # TODO: prompt the user for the location
-        _baseDir = baseDir = default
+        require
+            _baseDir is not nil
+        body
+            .startStage('Copy files to install directory')
+            slash = .slash
+            baseDir = _baseDir      
 
-        .requireDir(baseDir)
-        if Directory.exists(Path.combine(baseDir, 'Source'))
-            print 'The directory "[baseDir]" appears to contain a workspace or snapshot of the'
-            print 'Cobra source code, due to containing the subdirectory "Source".'
-            print 'Installing to that location can lead to confusion and technical difficulties.'
-            print 'Consider clearing out "[baseDir]" and creating a workspace *inside* it called,'
-            print 'for example, "Workspace".'
-            print
-            .error('Cannot install to workspace or workspace snapshot. See message above.')
-        
-        versionDir = '[baseDir][slash]Cobra-[_baseVersion]'
-        .deleteDir(versionDir)
-        .requireDir(versionDir)
-        _versionDir = versionDir
+            if baseDir, .requireDir(baseDir)
+            if Directory.exists(Path.combine(baseDir, 'Source'))
+                print 'The directory "[baseDir]" appears to contain a workspace or snapshot of the'
+                print 'Cobra source code, due to containing the subdirectory "Source".'
+                print 'Installing to that location can lead to confusion and technical difficulties.'
+                print 'Consider clearing out "[baseDir]" and creating a workspace *inside* it called,'
+                print 'for example, "Workspace".'
+                print
+                .error('Cannot install to workspace or workspace snapshot. See message above.')
 
-        # TODO: readme file?
-        parent = Path.getFullPath('..')
+            versionDir = '[baseDir][slash]Cobra-[_baseVersion]'
+            .deleteDir(versionDir)
+            .requireDir(versionDir)
+            _versionDir = versionDir
 
-        versionOutput = ''
-        if File.exists('[parent][slash]InformalRelease.text')
-            versionOutput = File.readAllText('[parent][slash]InformalRelease.text')
-        else
-            # record "svn info" in the installation directory
-            try
-                process as Process?
-                versionOutput = .runCommand('svn', 'info', out process, false)
-                if process.exitCode
-                    print '"snv info" failed. Check your svn installation.'
-                    print '[versionOutput]'
-                    print
+            # TODO: readme file?
+            parent = Path.getFullPath('..')
+
+            versionOutput = ''
+            if File.exists('[parent][slash]InformalRelease.text')
+                versionOutput = File.readAllText('[parent][slash]InformalRelease.text')
+            else
+                # record "svn info" in the installation directory
+                try
+                    process as Process?
+                    versionOutput = .runCommand('svn', 'info', out process, false)
+                    if process.exitCode
+                        print '"snv info" failed. Check your svn installation.'
+                        print '[versionOutput]'
+                        print
+                        .error('Cannot find version information, installation halted.')
+                catch ex as SystemException
+                    # user could be on TortoiseSVN
+                    print 'svn is not installed or it is not in the PATH. ', ex.message
                     .error('Cannot find version information, installation halted.')
-            catch ex as SystemException
-                # user could be on TortoiseSVN
-                print 'svn is not installed or it is not in the PATH. ', ex.message
-                .error('Cannot find version information, installation halted.')
-        if versionOutput <> ''
-            fileName = '[versionDir][slash]Version.text'
-            print 'writing  :', fileName
-            File.writeAllText(fileName, versionOutput)
-        print
+            if versionOutput <> ''
+                fileName = '[versionDir][slash]Version.text'
+                print 'writing  :', fileName
+                File.writeAllText(fileName, versionOutput)
+            print
 
-        for dir in ['HowTo', 'Reusables', 'Samples', 'Supplements']
-            .copyContents('[parent][slash][dir]', '[versionDir][slash][dir]')
+            for dir in ['HowTo', 'Reusables', 'Samples', 'Supplements']
+                .copyContents('[parent][slash][dir]', '[versionDir][slash][dir]')
 
-        versionBinDir = '[versionDir][slash]bin'
-        .requireDir(versionBinDir)
-        print 'copy  bin: [versionBinDir]'
-        binFiles = 'cobra.exe Cobra.Lang.dll styles-cobra-doc.css styles-exception-report.css styles-output-html.css'.split
-        for fileName in binFiles
-            File.copy(fileName, '[versionBinDir][slash][fileName]')
+            versionBinDir = '[versionDir][slash]bin'
+            .requireDir(versionBinDir)
+            print 'copy  bin: [versionBinDir]'
+            binFiles = 'cobra.exe Cobra.Lang.dll styles-cobra-doc.css styles-exception-report.css styles-output-html.css'.split
+            for fileName in binFiles
+                File.copy(fileName, '[versionBinDir][slash][fileName]')
 
-        .copyContents('Cobra.Lang', '[versionBinDir][slash]Cobra.Lang')
+            .copyContents('Cobra.Lang', '[versionBinDir][slash]Cobra.Lang')
 
-        # delete _svn or .svn from the installation directory
-        .findAndDeleteDir(versionDir, '_svn')
-        .findAndDeleteDir(versionDir, '.svn')
+            # delete _svn or .svn from the installation directory
+            .findAndDeleteDir(versionDir, '_svn')
+            .findAndDeleteDir(versionDir, '.svn')
 
-        # create cobra.bat / cobra for invoking the latest version
-        baseBinDir = '[baseDir][slash]bin'
-        .requireDir(baseBinDir)
-        if .isRunningOnUnix
-            _cobraCommandPath = '[baseBinDir][slash]cobra'
-            print 'writing  :', _cobraCommandPath
-            using f = File.createText(_cobraCommandPath)
-                f.writeLine('#!/bin/sh')
-                f.writeLine('exec mono "[versionDir][slash]bin[slash]cobra.exe" "$@"')
-            .runCommand('chmod', "a+x '[_cobraCommandPath]'")
-        else
-            _cobraCommandPath = '[baseBinDir][slash]cobra.bat'
-            print 'writing  :', _cobraCommandPath
-            using f = File.createText(_cobraCommandPath)
-                f.writeLine('@"[versionDir][slash]bin[slash]cobra.exe" %*')
-            print
+            # create cobra.bat / cobra for invoking the latest version
+            baseBinDir = '[baseDir][slash]bin'
+            .requireDir(baseBinDir)
+            if .isRunningOnUnix
+                _cobraCommandPath = '[baseBinDir][slash]cobra'
+                print 'writing  :', _cobraCommandPath
+                using f = File.createText(_cobraCommandPath)
+                    f.writeLine('#!/bin/sh')
+                    f.writeLine('exec mono "[versionDir][slash]bin[slash]cobra.exe" "$@"')
+                .runCommand('chmod', "a+x '[_cobraCommandPath]'")
+            else
+                _cobraCommandPath = '[baseBinDir][slash]cobra.bat'
+                print 'writing  :', _cobraCommandPath
+                using f = File.createText(_cobraCommandPath)
+                    f.writeLine('@"[versionDir][slash]bin[slash]cobra.exe" %*')
+                print
 
     def verifyNewlyInstalledCobra
         .startStage('Verify newly installed Cobra compiler')