Changeset 30265 for gs2-extensions

Timestamp:

2015-09-28T10:54:14+13:00 (9 years ago)

Author:

jmt12

Message:

Rather than assuming something will put the TDB binaries on the main PATH, the code will now use the GEXTTDBEDIT_INSTALLED environment variable to generate the full path to the binaries. Of course, lack of this variable will raise an error

File:

• gs2-extensions/tdb/trunk/perllib/dbutil/tdb.pm (modified) (1 diff)

gs2-extensions/tdb/trunk/perllib/dbutil/tdb.pm

@@ -54 +54 @@
 sub get_tdb_executable
 {
-  my $program = shift(@_);
-  my $program_exe = &util::filename_cat($program . &util::get_os_exe());
-  #if (!-x $program_exe)
-  #{
-  #  die('Fatal Error! File doesn\'t exist or isn\'t executable: ' . $program_exe);
-  #}
-  return $program_exe;
+    my $program = shift(@_);
+    if (!defined $ENV{GEXTTDBEDIT_INSTALLED} || !-d $ENV{GEXTTDBEDIT_INSTALLED})
+    {
+    die('Fatal Error! Path to TDB binaries not found. Have you sourced setup.bash?');
+    }
+    my $program_exe = &util::filename_cat($ENV{GEXTTDBEDIT_INSTALLED} . '/bin/' . $program . &util::get_os_exe());
+    if (!-x $program_exe)
+    {
+    die('Fatal Error! File doesn\'t exist or isn\'t executable: ' . $program_exe);
+    }
+    return $program_exe;
 }
 # /** get_tdb_executable() **/