Changeset 2011

Show
Ignore:
Timestamp:
01/05/09 23:04:34
Author:
douglm
Message:

Fix install script and dirtools so that we can add a user

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r2005 r2011  
    654654  </target> 
    655655 
    656   <target name="initDirForQuickstart" depends="init" 
     656  <target name="initDirForQuickstart" depends="init.build,build.rpiutil" 
    657657          description="Build and run directory tool to initialise a quickstart system"> 
    658658    <antfetch antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false" 
    …… 
    667667  </target> 
    668668 
    669   <target name="addUser" depends="init" 
     669  <target name="addUser" depends="init.build,build.rpiutil" 
    670670          description="Build and run directory tools to add a user"> 
    671671    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false" 
    …… 
    679679  </target> 
    680680 
    681   <target name="addGroup" depends="init" 
     681  <target name="addGroup" depends="init.build,build.rpiutil" 
    682682          description="Build and run directory tools to add a group"> 
    683683    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false" 
    …… 
    691691  </target> 
    692692 
    693   <target name="addGroupMember" depends="init" 
     693  <target name="addGroupMember" depends="init.build,build.rpiutil" 
    694694          description="Build and run directory tools to add a group member"> 
    695695    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false" 

  • trunk/build/quickstart/linux/adduser

    r1948 r2011  
    8585fi 
    8686 
    87 CLASSPATH=$ANT_HOME/lib/ant-launcher.jar 
     87ANT_CLASSPATH=$ANT_HOME/lib/ant-launcher.jar 
    8888 
    89 ant_home_def="-Dant.home=$ANT" 
     89ant_home_def="-Dant.home=$ANT_HOME" 
    9090ant_class_def="org.apache.tools.ant.launch.Launcher" 
    9191 
    …… 
    9595adduser_defs="$adduser_defs -Dorg.bedework.directory.password=$password" 
    9696 
    97 $JAVA_HOME/bin/java -classpath $CLASSPATH $ant_home_def $adduser_defs $ant_class_def addUser 
     97$JAVA_HOME/bin/java -classpath $ANT_CLASSPATH $ant_home_def $adduser_defs $ant_class_def addUser 

  • trunk/build/quickstart/linux/install

    r2008 r2011  
    3838 
    3939qsant="$ANT -buildfile $quickStartBuildFile" 
     40 
     41ANT_CLASSPATH=$ANT_HOME/lib/ant-launcher.jar 
     42 
     43qsantrunner="$JAVA_HOME/bin/java -classpath $ANT_HOME/lib/ant-launcher.jar -Dant.home=$ANT_HOME" 
     44ant_class_def="org.apache.tools.ant.launch.Launcher" 
    4045 
    4146shutdownServer() { 
    …… 
    116121 
    117122echo "Now we invoke the adduser script to add a superuser to the system" 
    118 echo "We need to know the account, first name last name and a password 
     123echo "We need to know the account, first name last name and a password" 
    119124 
    120125readVal "account" 
    …… 
    131136adduser_defs="$adduser_defs -Dorg.bedework.directory.password=$val" 
    132137 
    133 $qsant addUser 
     138$qsantrunner $adduser_defs $ant_class_def addUser 
    134139 
    135140exit 2