Changeset 28977

Show
Ignore:
Timestamp:
15.04.2014 16:40:41 (5 years ago)
Author:
ak19
Message:

1. gti.pl expected an svn checked-out folder containing scripts in gsdlhome/gti-lib, which can exist as gli/shared when generate-html.sh is run. 2. Removed hardcoded reference of full path to the custom/gti folder on puka, as this is simply gsdlhome.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/gti.pl

    r28976 r28977  
    712712     
    713713    my $classpath = &util::filename_cat($gsdl_root_directory, "gti-lib"); 
     714    my $oldclasspath = $classpath; 
    714715    if ( ! -e $classpath) { 
    715         &throw_fatal_error("$classpath doesn't exist! Need the files in this directory (ApplyXLST and its related files) to create the zip file for GLI Help"); 
    716     }     
    717      
     716    $classpath = &util::filename_cat($gsdl_root_directory, "gli", "shared"); 
     717    } 
     718    if ( ! -e $classpath) { 
     719        &throw_fatal_error("$classpath doesn't exist! (Neither does $oldclasspath.) Need the files in this directory (ApplyXLST and its related files) to create the zip file for GLI Help"); 
     720    } 
     721 
    718722    my $gli_help_directory = &util::filename_cat($gsdl_root_directory, "gli"); 
    719723    $gli_help_directory = &util::filename_cat($gli_help_directory, "help"); 
     
    744748    $response = `$cmd`; 
    745749     
    746     my $zip_file_path = "/greenstone/custom/gti/" . $target_language_code . "_GLIHelp.zip"; 
     750    #my $zip_file_path = "/greenstone/custom/gti/" . $target_language_code . "_GLIHelp.zip";     
     751    my $zip_file_path = &util::filename_cat($gsdl_root_directory, $target_language_code . "_GLIHelp.zip"); 
    747752    $cmd = "zip -rj $zip_file_path $target_file_directory -i \*.htm \*.xml"; 
    748753    $response = `$cmd`;