Changeset 20342


Ignore:
Timestamp:
2009-08-20T15:03:11+12:00 (15 years ago)
Author:
ak19
Message:

Changes Dr Bainbridge made to get the apache web server (local library server) to work again on the Mac. 1. It seems that the DYLD_LIBRARY_PATH was pointing to a different apache web server's lib folder and that was out of date. Therefore setup.bash now adds the apache web server's lib folder to the DYLD_LIBRARY_PATH. 2. gsicontrol.sh now checks the return value of starting and stopping the apache web server and only if successful does it now print out MONITOR_SUCCESS. Otherwise it now prints out MONITOR_FAILED.

Location:
gsdl/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/gsicontrol.sh

    r19453 r20342  
    124124    test-gsdlhome
    125125    $GSDLHOME/apache-httpd/$GSDLOS/bin/apachectl start
    126     echo $MONITOR_SUCCESS
    127     echo $MONITOR_FINISHED
     126    if [ $? = 0 ] ; then
     127    echo $MONITOR_SUCCESS;
     128    else
     129    echo $MONITOR_FAILED;
     130    fi
     131    echo $MONITOR_FINISHED;
    128132}
    129133
    … …  
    131135    test-gsdlhome
    132136    $GSDLHOME/apache-httpd/$GSDLOS/bin/apachectl restart
    133     echo $MONITOR_SUCCESS
    134     echo $MONITOR_FINISHED
     137    if [ $? = 0 ] ; then
     138    echo $MONITOR_SUCCESS;
     139    else
     140    echo $MONITOR_FAILED;
     141    fi
     142    echo $MONITOR_FINISHED;
    135143}
    136144
    … …  
    138146    test-gsdlhome
    139147    $GSDLHOME/apache-httpd/$GSDLOS/bin/apachectl graceful
    140     echo $MONITOR_SUCCESS
    141     echo $MONITOR_FINISHED
     148    if [ $? = 0 ] ; then
     149    echo $MONITOR_SUCCESS;
     150    else
     151    echo $MONITOR_FAILED;
     152    fi
     153    echo $MONITOR_FINISHED;
    142154}
    143155
    … …  
    155167    test-gsdlhome
    156168    web-stop-tested
    157     echo $MONITOR_SUCCESS
    158     echo $MONITOR_FINISHED
     169    if [ $? = 0 ] ; then
     170    echo $MONITOR_SUCCESS;
     171    else
     172    echo $MONITOR_FAILED;
     173    fi
     174    echo $MONITOR_FINISHED;
    159175}
    160176

  • gsdl/trunk/setup.bash

    r19156 r20342  
    246246  PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
    247247  export PATH
     248
     249  if test "$GSDLOS" = "linux" ; then
     250      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
     251      export LD_LIBRARY_PATH
     252 
     253  elif test "$GSDLOS" = "darwin" ; then
     254      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
     255      export DYLD_LIBRARY_PATH
     256  fi
    248257fi
    249258
Note: See TracChangeset for help on using the changeset viewer.