Changeset 21994

Timestamp:

2010-04-29T15:35:37+12:00 (14 years ago)

Author:

sjm84

Message:

Allows "Windows" as a valid os name for <os> tags

File:

• main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/Command.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/Command.java

@@ -111 +111 @@
     public String getCommandForCurrentOS()
     {
-    String command = (String)_osCommands.get(System.getProperty("os.name"));
+    String currentos = System.getProperty("os.name");
+
+    String command = (String)_osCommands.get(currentos);
     if(command != null){
         return command;
+    }
+    
+    if(currentos.contains("Windows")){
+        command = (String)_osCommands.get("Windows");
+        
+        if(command != null){
+        return command;
+        }   
     }
     return (String)_osCommands.get("default");