Changeset 25611 for main

Timestamp:

2012-05-16T15:33:46+12:00 (12 years ago)

Author:

sjm84

Message:

Sam's suggestion of just calling an ant target to run the config-admin target of the build.xml in the installed directory worked and is much better than a separacte exec call on Win and on Linux/Mac.

File:

• main/trunk/release-kits/kits/rk3/installer/build.xml (modified) (1 diff)

main/trunk/release-kits/kits/rk3/installer/build.xml

@@ -342 +342 @@
         <echo>Creating admin user</echo>
         <!--<echo>Creating admin and demo users</echo>-->
-        <!-- if windows -->
-        <exec dir="${installDir}" executable="cmd.exe">
-          <arg line="/c echo ${admin.password}| ant config-admin"/>
-        </exec>
-        <!-- /if -->
-        <!-- if linux|mac -->
-        <exec dir="${installDir}" executable="echo">
-          <arg line="${admin.password}| ant config-admin"/>
-        </exec>
-        <!-- /if -->        
+        <ant dir="${installDir}" antfile="build.xml" target="config-admin" inheritAll="false">
+          <property name="admin.password" value="${admin.password}"/>         
+        </ant>
         <!--<adduser txt2db="org.greenstone.gsdl3.util.ChangePwdUsersDB"
             usersDb="${installDir}/web/sites/localsite/etc/usersDB"