Changeset 32221 for main/trunk/greenstone2

Timestamp:

2018-06-26T15:57:25+12:00 (6 years ago)

Author:

ak19

Message:

Cosmetic changes: some cleanup.

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/gsConvert.pl

@@ -848 +848 @@
     my $xpdf_pdftohtml = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "xpdf-tools");
     
-    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
-        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
-    #} elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
-        # TODO
+    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
+    $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
     } else { # unix (linux|darwin), use the bin32/bin64 folder depending on the BITNESS env var
     
-        # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since
-        # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit
-        # specific subdirectories exist in a greenstone installation.
-        # None of those locations need exist when xpdf-tools is installed with GS.
-        # So don't depend on GSDLARCH as forcing that to be exported has side-effects
-        if($ENV{'BITNESS'}) {
-            $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin".$ENV{'BITNESS'});
-        } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64?
-            $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
-        }
+    # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since
+    # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit
+    # specific subdirectories exist in a greenstone installation.
+    # None of those locations need exist when xpdf-tools is installed with GS.
+    # So don't depend on GSDLARCH as forcing that to be exported has side-effects
+    if($ENV{'BITNESS'}) {
+        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin".$ENV{'BITNESS'});
+    } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64?
+        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
+    }
     }