Changeset 6688079 in tol for tolbase

Timestamp:

Mar 14, 2016, 12:49:45 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

c6181a1

Parents:

6755180

Message:

fixes #1920, se corrige tambien en tolcon, tolbase, tolsh

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

File:

• tolbase/generic/tolbase.c (modified) (1 diff)

tolbase/generic/tolbase.c

@@ -178 +178 @@
     //Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1);
 #else
-    const char* exeName = Tcl_GetNameOfExecutable();
-    Tcl_VarEval( interp, "file join",
-                 " [ file dir ", Tcl_GetNameOfExecutable(),
-                 " ] tolbase.tcl", NULL );
+    const char* argv0 = Tcl_GetNameOfExecutable();
+    Tcl_VarEval( interp, "file join ",
+                 "[ file dir [expr {[file type {", argv0, "}] eq {link} ? [file readlink {", argv0, "}] : {", argv0 ,"}} ] ] tolbase.tcl", NULL );
     Tcl_Obj *objPath = Tcl_GetObjResult( interp );
     Tcl_SetStartupScript( Tcl_GetObjResult( interp ), NULL );