Changeset 21895


Ignore:
Timestamp:
2010-04-16T20:20:39+12:00 (11 years ago)
Author:
ak19
Message:

Can set envvars ourselves instead of preserving it 'if it exists'. It will exist because we copy it into the installation location. Therefore we now always do a replace on the placeholder APACHE_HOME_OS in this file.

File:
1 edited

Legend:

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

    r21894 r21895  
    5353fi
    5454
    55 if [ -f "$SR/bin/envvars" ]
    56 then
    57   echo "[Preserving existing envvars settings.]"
    58   HAD_ENVVARS=yes
    59 else
    60   HAD_ENVVARS=no
    61 fi
     55# we're the ones putting the apache httpd together, including the envvars file
     56# 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
    6264
    6365# Need to run this script from its own directory
     
    9597chmod u+rwx "$SR/bin/envvars-std"
    9698
    97 if [ $HAD_ENVVARS = no ]
    98 then
    99     cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
    100     sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
    101     mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars"
    102 fi
    103  
     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
     106cp -p "$SR/bin/envvars-std" "$SR/bin/envvars"
     107sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp"
     108mv "$SR/bin/envvars.tmp" > "$SR/bin/envvars"
     109
    104110
    105111# Non-crucial files (replacements not essential)
Note: See TracChangeset for help on using the changeset viewer.