Changeset 27862

Show
Ignore:
Timestamp:
15.07.2013 22:34:08 (6 years ago)
Author:
davidb
Message:

Changed to triggering ant command to ensure gsdl-writablehome is correctly initialized

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-server.sh

    r27861 r27862  
    3939    echo "Setting Greenstone3 web home writable area to be: $gsdl3_writablehome" 
    4040 
    41     if [ ! -d "$gsdl3_writablehome" ] ; then 
    42         echo "Creating the directory: $gsdl3_writablehome" 
    4341 
    44         mkdir -p "$gsdl3_writablehome"  
    45         mkdir -p "$gsdl3_writablehome/packages"  
    46         mkdir -p "$gsdl3_writablehome/logs"  
    47         mkdir -p "$gsdl3_writablehome/ext/solr"  
     42#   if [ ! -d "$gsdl3_writablehome" ] ; then 
     43#       echo "Creating the directory: $gsdl3_writablehome" 
    4844 
    49         chmod a+rwx "$gsdl3_writablehome"  
    50         chmod a+rwx "$gsdl3_writablehome/packages"  
    51         chmod a+rwx "$gsdl3_writablehome/logs"  
    52         chmod a+rwx "$gsdl3_writablehome/ext/solr"  
     45#       mkdir -p "$gsdl3_writablehome"  
     46#       mkdir -p "$gsdl3_writablehome/packages"  
     47#       mkdir -p "$gsdl3_writablehome/logs"  
     48#       mkdir -p "$gsdl3_writablehome/ext/solr"  
    5349 
    54 #       echo "Copying to $gsdl3_writablehome/packages/tomcat" 
    55 #           /bin/cp -r "$GSDL3SRCHOME/packages/tomcat" "$gsdl3_writablehome/packages/." 
     50#       chmod a+rwx "$gsdl3_writablehome"  
     51#       chmod a+rwx "$gsdl3_writablehome/packages"  
     52#       chmod a+rwx "$gsdl3_writablehome/logs"  
     53#       chmod a+rwx "$gsdl3_writablehome/ext/solr"  
    5654 
    57 #            echo "=> Copying Greenstone's web/WEB-INF to writable area" 
     55##      echo "Copying to $gsdl3_writablehome/packages/tomcat" 
     56##          /bin/cp -r "$GSDL3SRCHOME/packages/tomcat" "$gsdl3_writablehome/packages/." 
     57 
     58##            echo "=> Copying Greenstone's web/WEB-INF to writable area" 
    5859         
    59 #       gsdl3_home=$GSDL3HOME 
    60 #       /bin/cp -r "$gsdl3_home/WEB-INF" "$gsdl3_writablehome/." 
    61 #       /bin/cp -r "$gsdl3_home/index.html" "$gsdl3_writablehome/." 
    62     fi 
     60##      gsdl3_home=$GSDL3HOME 
     61##      /bin/cp -r "$gsdl3_home/WEB-INF" "$gsdl3_writablehome/." 
     62##      /bin/cp -r "$gsdl3_home/index.html" "$gsdl3_writablehome/." 
     63##  fi 
    6364    fi 
    6465} 
     
    8586popd > /dev/null 
    8687 
     88 
    8789check_gsdl3home_writable 
    8890 
     
    9092if [ $gsdl3home_isreadonly = 1 ] ; then 
    9193    opt_properties="-Dgsdl3home.isreadonly=true -Dgsdl3.writablehome=$gsdl3_writablehome" 
     94 
     95    # Calling ant target to initialize the gsdl3-writablehome area 
     96    # ... including the all important global.properties. 
     97 
     98    ant $opt_properties configure-web 
     99 
    92100fi 
    93101