From 4b956449f5b06383831a203134041c4649edff3a Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 18 Jan 2019 15:10:35 -0500 Subject: reset zipfs mount point --- ds9/library/ds9.tcl | 2 +- ds9/unix/Makefile.in | 2 +- ds9/unix/ds9.C | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index 31772b8..8fc9090 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -199,7 +199,7 @@ switch $ds9(wm) { switch $ds9(wm) { x11 { - set ds9(root) "[::tcl::zipfs::root]zipfsmntpt" + set ds9(root) "[::tcl::zipfs::root]mntpt" set auto_path $ds9(root) package require msgcat diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index 72abbaf..23d8388 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -70,7 +70,7 @@ system = @system@ #--------------------------defines -APPDIR = zipfsmntpt +APPDIR = mntpt LIBDIR= $(APPDIR) ID = $(shell finger $(shell whoami) | egrep -o 'Name: [a-zA-Z0-9 ]{1,}' | cut -d ':' -f 2 | head -n 1| xargs echo) diff --git a/ds9/unix/ds9.C b/ds9/unix/ds9.C index ba01780..418b160 100644 --- a/ds9/unix/ds9.C +++ b/ds9/unix/ds9.C @@ -62,11 +62,11 @@ int SAOLocalMainHook(int* argcPtr, char*** argvPtr) // so that tcl and tk know where to find their libs // we do it here before InitLibraryPath is called - putenv((char*)"TCL_LIBRARY=zipfs:/zipfsmntpt/tcl8.6"); - putenv((char*)"TK_LIBRARY=zipfs:/zipfsmntpt/tk8.6"); + putenv((char*)"TCL_LIBRARY=zipfs:/mntpt/tcl8.6"); + putenv((char*)"TK_LIBRARY=zipfs:/mntpt/tk8.6"); // startup script - Tcl_Obj *path = Tcl_NewStringObj("zipfs:/zipfsmntpt/library/ds9.tcl",-1); + Tcl_Obj *path = Tcl_NewStringObj("zipfs:/mntpt/library/ds9.tcl",-1); Tcl_SetStartupScript(path, NULL); return TCL_OK; -- cgit v0.12