Changeset 19755 for release-kits

Timestamp:

2009-06-08T13:34:49+12:00 (15 years ago)

Author:

oranfry

Message:

defaultValue for DirectoryInput is now a comma separated list of choices for the install directory, which will be iterated at runtime and the first writable directory in the list chosen as the default install directory

Location:

release-kits

Files:

• lirk2/installer/antinstall-config.xml (modified) (1 diff)
• lirk3/installer/antinstall-config.xml (modified) (1 diff)
• mark2/installer/antinstall-config.xml (modified) (1 diff)
• mark3/installer/antinstall-config.xml (modified) (1 diff)
• shared/core/ant-installer/src/org/tp23/antinstaller/input/DirectoryInput.java (modified) (4 diffs)
• wirk2/installer/antinstall-config.xml (modified) (1 diff)
• wirk3/installer/antinstall-config.xml (modified) (1 diff)

release-kits/lirk2/installer/antinstall-config.xml

@@ -48 +48 @@
 
         <directory property="installDir"
-            defaultValue="/usr/local/Greenstone2"
+            defaultValue="/usr/local/Greenstone2,${env.HOME}/Greenstone2"
             create="true"
             displayText=""

release-kits/lirk3/installer/antinstall-config.xml

@@ -45 +45 @@
 
         <directory property="installDir"
-            defaultValue="/usr/local/Greenstone3"
+            defaultValue="/usr/local/Greenstone3,${env.HOME}/Greenstone3"
             create="true"
             displayText=""

release-kits/mark2/installer/antinstall-config.xml

@@ -46 +46 @@
 
         <directory property="installDir"
-            defaultValue="/usr/local/Greenstone2"
+            defaultValue="/usr/local/Greenstone2,${env.HOME}/Greenstone2"
             create="true"
             displayText=""

release-kits/mark3/installer/antinstall-config.xml

@@ -46 +46 @@
 
         <directory property="installDir"
-            defaultValue="/usr/local/Greenstone3"
+            defaultValue="/usr/local/Greenstone3,${env.HOME}/Greenstone3"
             create="true"
             displayText=""

release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/input/DirectoryInput.java

@@ -17 +17 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ResourceBundle;
+import java.util.ArrayList;
 
 import org.tp23.antinstaller.InstallerContext;
@@ -37 +39 @@
     private String create;
     private String checkExists;
+
+    //to make default install directory choice smart
+    private String decidedDefault = null;
 
     //to detect previous installations
@@ -98 +103 @@
     }
 
+    public String getDefaultValue(boolean correctForOS) {
+
+        if ( this.defaultValue == null ) {
+            return null;
+        }
+
+        if ( decidedDefault != null ) {
+            return decidedDefault;
+        }
+
+        String[] defaultsArray = defaultValue.split(",");
+        for ( int i=0; i<defaultsArray.length; i++ ) {
+            String def = resultContainer.getDefaultFileRef(defaultsArray[i]);
+            File defFile = new File( def );
+
+            //if the path is a file, go to next
+            if ( defFile.isFile() ) {
+                continue;
+            }
+
+            //if the path is a directory, try to write a little file to it
+            if ( defFile.isDirectory() ) {
+                File testFile = new File( defFile, "ant-installer-test-file-(ok-to-delete)" );
+                boolean result = false;
+                try { result = testFile.createNewFile(); } catch ( IOException ioe ) {}
+                if ( result ) {
+                    decidedDefault = def;
+                    try { testFile.delete(); } catch ( SecurityException se ) {}
+                    return decidedDefault;
+                }
+            }
+
+            //if the path doesn't exist, try to create it as a directory
+            if ( !defFile.exists() ) {
+                if ( defFile.mkdir() ) {
+                    decidedDefault = def;
+                    try { defFile.delete(); } catch ( SecurityException se ) {}
+                    return decidedDefault;
+                }
+            }
+            
+        }
+
+        decidedDefault = resultContainer.getDefaultFileRef(
+            defaultsArray[defaultsArray.length-1]
+            );
+        return decidedDefault;
+
+    }
+
     public boolean isAbort() {
         return abort;
@@ -154 +209 @@
             return false;
         }
-        if(getDefaultValue() == null){
+        if(defaultValue == null){
             System.out.println("Directory:defaultValue must be set");
             return false;
         }
-        if(getDefaultValue().equals("")){
+        if(defaultValue.equals("")){
             if( isTrue(getCreate()) || isTrue(getCheckExists()) ) {
                 System.out.println("Directory:defaultValue must be set if checkExists or create are true");

release-kits/wirk2/installer/antinstall-config.xml

@@ -46 +46 @@
     <!-- Because of Vista UAC related issues, it is now preferred to install Greenstone where the current user has full privileges -->
         <directory property="installDir"
-            defaultValue="${env.HOMEDRIVE}\${env.HOMEPATH}\Greenstone2"
+            defaultValue="C:\Program Files\Greenstone2,${env.HOMEDRIVE}\${env.HOMEPATH}\Greenstone2"
             create="true"
             displayText=""

release-kits/wirk3/installer/antinstall-config.xml

@@ -46 +46 @@
     <!-- Because of Vista UAC related issues, it is now preferred to install Greenstone where the current user has full privileges -->
         <directory property="installDir"
-            defaultValue="${env.HOMEDRIVE}\${env.HOMEPATH}\Greenstone3"
+            defaultValue="C:\Program Files\Greenstone3,${env.HOMEDRIVE}\${env.HOMEPATH}\Greenstone3"
             create="true"
             displayText=""