From dcece198527eb3012a081402ad2e117e2136a4a4 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 1 Aug 2011 11:30:31 +0200
Subject: import trunk@2167

---
 src/installer/resources/build.xml | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 src/installer/resources/build.xml

(limited to 'src/installer/resources/build.xml')

diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml
old mode 100644
new mode 100755
index b4201d8..ae85dfa
--- a/src/installer/resources/build.xml
+++ b/src/installer/resources/build.xml
@@ -10,37 +10,23 @@
     
     <!-- Load ant-contrib tasks -->
     <taskdef resource="net/sf/antcontrib/antlib.xml" />
-    
-    <!-- Load Internet2 ant extensions -->
-    <taskdef resource="edu/internet2/middleware/ant/antlib.xml" />
 
     <!-- install - for deployment -->
     <target name="install" description="Creates the discovery service home directory, install configuration files, and create the service's WAR.">
 
-        <input message="Where should the Shibboleth Discovery Service software be installed?"
-               addproperty="ds.home.input"
-               defaultvalue="${ds.home}" />
-        <var name="ds.home" value="${ds.home.input}" />
-            
-        <pathToAbsolutePath path="${ds.home}" addproperty="ds.home.path" />
-        <pathToUrl path="${ds.home}" addproperty="ds.home.url" />
-        
-        <if>
-            <available file="${ds.home.path}" property="ds.home.exists"/>
-            <then>
-                <input message="The directory '${ds.home.path}' already exists.  Would you like to overwrite your existing configuration?"
-                       addproperty="install.config"
-                       validargs="yes,no"
-                       defaultvalue="no" />
-            </then>
-            <else>
-                <var name="install.config" value="yes"/>
-            </else>
-        </if>
+        <input message="Is this a new installation? Answering 'yes' will overwrite your current configuration."
+               addproperty="new.install"
+               validargs="yes,no"
+               defaultvalue="no" />
 
         <if>
-            <equals arg1="${install.config}" arg2="yes" />
+            <equals arg1="${new.install}" arg2="yes" />
             <then>
+                <input message="Where should the Shibboleth Discovert Service software be installed?"
+                       addproperty="ds.home.input"
+                       defaultvalue="${ds.home}" />
+                <var name="ds.home" value="${ds.home.input}" />
+
                 <propertyfile file="${resources.dir}/install.properties">
                     <entry key="ds.home" value="${ds.home}" />
                 </propertyfile>
-- 
cgit v1.1