Changeset 3022

Timestamp:

2002-02-28T14:07:23+13:00 (22 years ago)

Author:

jrm21

Message:

New scripts won't append $GSDLHOME to the exec name as badness happens
on windows if there are spaces in it. This will happen on unix too, but
unix people don't normally put spaces in directory names...

Location:

trunk/gsdl/bin/script

Files:

• ppttohtml.pl (modified) (1 diff)
• xlstohtml.pl (modified) (1 diff)

trunk/gsdl/bin/script/ppttohtml.pl

@@ -18 +18 @@
 # try to find ppthtml binary in GSDLHOME
 my $ppthtml_binary="ppthtml";
-my $os_exeext="";
 my $GSDLOS=$ENV{'GSDLOS'};
 my $GSDLHOME=$ENV{'GSDLHOME'};
 if ($GSDLOS =~ /^windows$/i) {
-    $os_exeext=".exe";
+    $ppthtml_binary.=".exe";
 }
 
-if (-x "$GSDLHOME/bin/$GSDLOS/ppthtml$os_exeext") {
-    $ppthtml_binary="$GSDLHOME/bin/$GSDLOS/ppthtml$os_exeext";
+# assume it is on the path if running under windows, in case GSDLHOME
+# has a space
+if ($GSDLOS !~ /windows/i && -x "$GSDLHOME/bin/$GSDLOS/$ppthtml_binary") {
+    $ppthtml_binary="$GSDLHOME/bin/$GSDLOS/$ppthtml_binary";
 }
 

trunk/gsdl/bin/script/xlstohtml.pl

@@ -18 +18 @@
 # try to find xlhtml binary in GSDLHOME
 my $xlhtml_binary="xlhtml";
-my $os_exeext="";
 my $GSDLOS=$ENV{'GSDLOS'};
 my $GSDLHOME=$ENV{'GSDLHOME'};
-if ($GSDLOS =~ /^windows$/i) {
-    $os_exeext=".exe";
+if ($GSDLOS =~ /^windows/i) {
+    $xlhtml_binary.=".exe";
 }
 
-if (-x "$GSDLHOME/bin/$GSDLOS/xlhtml$os_exeext") {
-    $xlhtml_binary="$GSDLHOME/bin/$GSDLOS/xlhtml$os_exeext";
+# Trouble happens if there are spaces in GSDLHOME. Assume that on windows
+# the program is found in the path.
+if ($GSDLOS !~ /windows/i && -x "$GSDLHOME/bin/$GSDLOS/$xlhtml_binary") {
+    $xlhtml_binary="$GSDLHOME/bin/$GSDLOS/$xlhtml_binary";
 }