Changeset 32221

Show
Ignore:
Timestamp:
26.06.2018 15:57:25 (4 weeks ago)
Author:
ak19
Message:

Cosmetic changes: some cleanup.

Files:
1 modified

Legend:

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

    r32220 r32221  
    848848    my $xpdf_pdftohtml = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "xpdf-tools"); 
    849849     
    850     if($ENV{'GSDLOS'} =~ m/^windows$/i) { # For Windows, just use the 32 bit xpdf's pdftohtml as it works the same as the 64 bit 
    851         $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32"); 
    852     #} elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) { 
    853         # TODO 
     850    if($ENV{'GSDLOS'} =~ m/^windows$/i) { # For Windows, just use the 32 bit xpdf's pdftohtml as it works the same as the 64 bit 
     851    $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32"); 
    854852    } else { # unix (linux|darwin), use the bin32/bin64 folder depending on the BITNESS env var 
    855853     
    856         # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since 
    857         # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit 
    858         # specific subdirectories exist in a greenstone installation. 
    859         # None of those locations need exist when xpdf-tools is installed with GS. 
    860         # So don't depend on GSDLARCH as forcing that to be exported has side-effects 
    861         if($ENV{'BITNESS'}) { 
    862             $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin".$ENV{'BITNESS'}); 
    863         } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64? 
    864             $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32"); 
    865         } 
     854    # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since 
     855    # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit 
     856    # specific subdirectories exist in a greenstone installation. 
     857    # None of those locations need exist when xpdf-tools is installed with GS. 
     858    # So don't depend on GSDLARCH as forcing that to be exported has side-effects 
     859    if($ENV{'BITNESS'}) { 
     860        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin".$ENV{'BITNESS'}); 
     861    } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64? 
     862        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32"); 
     863    } 
    866864    } 
    867865