Changeset 25611

Show
Ignore:
Timestamp:
16.05.2012 15:33:46 (7 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r25447 r25611  
    342342        <echo>Creating admin user</echo> 
    343343        <!--<echo>Creating admin and demo users</echo>--> 
    344         <!-- if windows --> 
    345         <exec dir="${installDir}" executable="cmd.exe"> 
    346           <arg line="/c echo ${admin.password}| ant config-admin"/> 
    347         </exec> 
    348         <!-- /if --> 
    349         <!-- if linux|mac --> 
    350         <exec dir="${installDir}" executable="echo"> 
    351           <arg line="${admin.password}| ant config-admin"/> 
    352         </exec> 
    353         <!-- /if -->         
     344        <ant dir="${installDir}" antfile="build.xml" target="config-admin" inheritAll="false"> 
     345          <property name="admin.password" value="${admin.password}"/>          
     346        </ant> 
    354347        <!--<adduser txt2db="org.greenstone.gsdl3.util.ChangePwdUsersDB" 
    355348            usersDb="${installDir}/web/sites/localsite/etc/usersDB"