Changeset 9417624 in tol

Timestamp:

Jun 27, 2011, 8:42:29 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

d007920

Parents:

b791e9d

Message:

tolsh on unix x86_64 platform must include /usr/lib in auto_path

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3663 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl (modified) (3 diffs)

tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl

@@ -289 +289 @@
 
 proc ::tolsh::setup_pkg { pkg } {
+  #puts ":tolsh::setup_pkg $pkg [namespace exist ::starkit] "
   if {[lsearch [package names] $pkg]==-1} {
     if {[namespace exist ::starkit]} {
@@ -296 +297 @@
       if {[llength $pkg_dirs]} {
         lappend ::auto_path [file normalize $libdir]
+      } elseif { $::tcl_platform(platform) eq "unix" && 
+          $::tcl_platform(machine) eq "x86_64" } {
+          if { [ lsearch $::auto_path "/usr/lib" ] == -1 } {
+            lappend ::auto_path "/usr/lib"
+          }
       } else {
-        set tclsh [auto_execok tclsh]
-        if {![catch {
-          exec echo puts {$::auto_path} | $tclsh
-        } ext_auto_path]} {
-          foreach p $ext_auto_path {
-            if {[lsearch $::auto_path $p]==-1} {
-              lappend ::auto_path $p
+          set tclsh [auto_execok tclsh]
+          if {![catch {
+            exec echo puts {$::auto_path} | $tclsh
+          } ext_auto_path]} {
+            foreach p $ext_auto_path {
+              if {[lsearch $::auto_path $p]==-1} {
+                lappend ::auto_path $p
+              }
             }
           }
-        }
       } 
       tclPkgUnknown ${pkg}+1 ""
@@ -565 +571 @@
 
 proc logtmp { msg } {
-  return 
+  #return 
   set user [ exec whoami ]
   set fd [ open "/tmp/tolsh.${user}.log" a ]