Ignore:
Timestamp:
2010-04-19T14:40:39+12:00 (12 years ago)
Author:
ak19
Message:

Reinstating some of the handling of envvars file to before previous

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/install-bindist.sh

    r21895 r21906  
    5555# we're the ones putting the apache httpd together, including the envvars file
    5656# so we can over-write it
    57 #if [ -f "$SR/bin/envvars" ]
    58 #then
    59 #  echo "[Preserving existing envvars settings.]"
    60 #  HAD_ENVVARS=yes
    61 #else
    62 #  HAD_ENVVARS=no
    63 #fi
     57if [ -f "$SR/bin/envvars" ]
     58then
     59  echo "[Preserving existing envvars settings.]"
     60  HAD_ENVVARS=yes
     61else
     62  HAD_ENVVARS=no
     63fi
    6464
    6565# Need to run this script from its own directory
     
    9797chmod u+rwx "$SR/bin/envvars-std"
    9898
    99 #if [ $HAD_ENVVARS = no ]
    100 #then
    101 #    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
    102 #    sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
    103 #    mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars"
    104 #fi
    105 
    106 cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
     99if [ $HAD_ENVVARS = no ]
     100then
     101    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
     102fi
     103# Either way, do a find and replace on APACHE_HOME_OS in the envvars file
    107104sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
    108105mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars"
Note: See TracChangeset for help on using the changeset viewer.