Changeset 25062

Show
Ignore:
Timestamp:
09.02.2012 14:35:02 (8 years ago)
Author:
sjm84
Message:

The installer will now use the correct directory for the cgi-bin files

Files:
1 modified

Legend:

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

    r24631 r25062  
    123123 
    124124        <echo>Filling in concrete values in config files</echo> 
    125         <copy file="${installDir}/cgi-bin/gsdlsite.cfg.in" tofile="${installDir}/cgi-bin/gsdlsite.cfg"/> 
    126         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="&quot;?\*\*GSDLHOME\*\*&quot;?" replacement="&quot;${installDir.local}&quot;"/> 
     125        <copy file="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg.in" tofile="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg"/> 
     126        <rsr file="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg" pattern="&quot;?\*\*GSDLHOME\*\*&quot;?" replacement="&quot;${installDir.local}&quot;"/> 
    127127 
    128128        <echo>Correcting perl shebangs in perl scripts</echo> 
    129129        <!-- if linux|mac --> 
    130130        <exec executable="which" outputproperty="perl.executable"><arg value="perl"/></exec> 
    131         <rsr file="${installDir}/cgi-bin/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
     131        <rsr file="${installDir}/cgi-bin/${shell.name}/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    132132        <!-- /if --> 
    133133        <!-- if windows --> 
    134134        <property name="perl.executable" value="${installDir.local}\bin\windows\perl\bin\perl.exe"/> 
    135         <rsr file="${installDir}/cgi-bin/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
     135        <rsr file="${installDir}/cgi-bin/${shell.name}/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    136136        <!-- /if --> 
    137137