From 7481db101ada6d2ab23224272cf0339f20a3585c Mon Sep 17 00:00:00 2001 From: Torsten Date: Tue, 6 Aug 2024 06:20:44 +0000 Subject: resolution of ticket [7db9574a06] --- doc/tclsh.1 | 11 +++++++---- doc/zipfs.n | 12 ++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/doc/tclsh.1 b/doc/tclsh.1 index f4b0134..10f724d 100644 --- a/doc/tclsh.1 +++ b/doc/tclsh.1 @@ -161,11 +161,14 @@ See \fBTcl_StandardChannels\fR for more explanations. When a zipfile is concatenated to the end of a \fBtclsh\fR, on startup the contents of the zip archive will be mounted under a virtual file system (VFS). The root of that VFS can be retrieved using the \fBzipfs root\fR -command. If a top level directory \fBtcl_library\fR is -present in the zip archive, it will become the directory loaded as -env(TCL_LIBRARY). If a file named \fBmain.tcl\fR is present in the top +command. The zip archive is mounted under the \fBapp\fR directory within the +VFS. If a file named \fBmain.tcl\fR is present in the top level directory of the zip archive, it will be sourced instead of the -shell's normal command line handing. +shell's normal command line handing. If a top level directory \fBtcl_library\fR is +present in the zip archive, it will become the directory loaded as +env(TCL_LIBRARY). If the file \fBtcl_library/init.tcl\fR is present in the zip +archive, the \fBtcl_library\fR global variable in the initial Tcl interpreter +is set to \fBapp/tcl_library\fR. .PP Only one zipfile can be concatenated to the end of executable image (tclsh, or wish). However, if multiple zipfiles are diff --git a/doc/zipfs.n b/doc/zipfs.n index a0987cd..119e179 100644 --- a/doc/zipfs.n +++ b/doc/zipfs.n @@ -19,17 +19,16 @@ zipfs \- Mount and work with ZIP files within Tcl \fBzipfs find\fI directoryName\fR \fBzipfs info\fI filename\fR \fBzipfs list\fR ?(\fB\-glob\fR|\fB\-regexp\fR)? ?\fIpattern\fR? -\fBzipfs lmkimg\fI outfile inlist\fR ?\fIpassword infile\fR? +\fBzipfs lmkimg\fI outfile inlist\fR ?\fIpassword\fR? ?\fIinfile\fR? \fBzipfs lmkzip\fI outfile inlist\fR ?\fIpassword\fR? \fBzipfs mkimg\fI outfile indir\fR ?\fIstrip\fR? ?\fIpassword\fR? ?\fIinfile\fR? \fBzipfs mkkey\fI password\fR \fBzipfs mkzip\fI outfile indir\fR ?\fIstrip\fR? ?\fIpassword\fR? \fBzipfs mount\fR ?\fIzipfile\fR? ?\fImountpoint\fR? ?\fIpassword\fR? +\fBzipfs mountdata\fR \fIdata\fR \fImountpoint\fR \fBzipfs root\fR \fBzipfs unmount\fI mountpoint\fR .fi -'\" The following subcommand is *UNDOCUMENTED* -'\" \fBzipfs mountdata\fR ?\fIdata\fR ?\fImountpoint\fR?? .BE .SH DESCRIPTION .PP @@ -143,6 +142,11 @@ uses direct access to the OS rather than through Tcl's filesystem API, it will not see the current directory as being inside the mount and will not be able to access the files inside the mount). .RE +.TP +.\" METHOD: mountdata +\fBzipfs mountdata\fR \fIdata\fR \fImountpoint\fR +Mounts the ZIP archive content \fIdata\fR as a Tcl virtual filesystem at +\fImountpoint\fR. .\" METHOD: root .TP \fBzipfs root\fR @@ -221,7 +225,7 @@ Given the clear text \fIpassword\fR argument, an obfuscated string version is returned with the same format used in the \fBzipfs mkimg\fR command. .\" METHOD: lmkimg .TP -\fBzipfs lmkimg\fI outfile inlist\fR ?\fIpassword infile\fR? +\fBzipfs lmkimg\fI outfile inlist\fR ?\fIpassword\fR? ?\fIinfile\fR? . This command is like \fBzipfs mkimg\fR, but instead of an input directory, \fIinlist\fR must be a Tcl list where the odd elements are the names of files -- cgit v0.12