From 46f71ebd510380f797b73c69bab4b00b2affb6bf Mon Sep 17 00:00:00 2001 From: Julian Noble Date: Sat, 26 Jul 2025 16:34:31 +1000 Subject: [PATCH] fix punk::zip::mkzip to accept -- end of options marker --- src/bootsupport/modules/punk/zip-0.1.1.tm | 47 ++++++++++--------- src/modules/punk/zip-999999.0a1.0.tm | 47 ++++++++++--------- .../src/bootsupport/modules/punk/zip-0.1.1.tm | 47 ++++++++++--------- .../src/bootsupport/modules/punk/zip-0.1.1.tm | 47 ++++++++++--------- .../_vfscommon.vfs/modules/punk/zip-0.1.1.tm | 47 ++++++++++--------- 5 files changed, 125 insertions(+), 110 deletions(-) diff --git a/src/bootsupport/modules/punk/zip-0.1.1.tm b/src/bootsupport/modules/punk/zip-0.1.1.tm index 97bbe591..87863f88 100644 --- a/src/bootsupport/modules/punk/zip-0.1.1.tm +++ b/src/bootsupport/modules/punk/zip-0.1.1.tm @@ -575,42 +575,45 @@ tcl::namespace::eval punk::zip { "Create a zip archive in 'filename'" @opts -offsettype -default "archive" -choices {archive file}\ - -help "zip offsets stored relative to start of entire file or relative to start of zip-archive - Only relevant if the created file has a script/runtime prefix. - " + -help\ + "zip offsets stored relative to start of entire file or relative to start of zip-archive + Only relevant if the created file has a script/runtime prefix." -return -default "pretty" -choices {pretty list none}\ - -help "mkzip can return a list of the files and folders added to the archive - the option -return pretty is the default and uses the punk::lib pdict/plist system - to return a formatted list for the terminal + -help\ + "mkzip can return a list of the files and folders added to the archive + the option -return pretty is the default and uses the punk::lib pdict/plist system + to return a formatted list for the terminal " -zipkit -default 0 -type none\ - -help "whether to add mounting script - mutually exclusive with -runtime option - currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs - " + -help\ + "whether to add mounting script + mutually exclusive with -runtime option + currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs" -runtime -default ""\ - -help "specify a prefix file - e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip - will create a self-extracting zip archive from the subdir/ folder. - Expects runtime with no existing vfs attached (review) - " + -help\ + "specify a prefix file + e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip + will create a self-extracting zip archive from the subdir/ folder. + Expects runtime with no existing vfs attached (review)" -comment -default ""\ -help "An optional comment for the archive" -directory -default ""\ - -help "The new zip archive will scan for contents within this folder or current directory if not provided. - Note that this will - " + -help "Scan for contents within this folder or current directory if not provided." -base -default ""\ - -help "The new zip archive will be rooted in this directory if provided - it must be a parent of -directory or the same path as -directory" + -help\ + "The new zip archive will be rooted in this directory if provided + it must be a parent of -directory or the same path as -directory" -exclude -default {CVS/* */CVS/* *~ ".#*" "*/.#*"} + -- -type none -help\ + "End of options marker" @values -min 1 -max -1 filename -type file -default ""\ -help "name of zipfile to create" globs -default {*} -multiple 1\ - -help "list of glob patterns to match. - Only directories with matching files will be included in the archive." + -help\ + "list of glob patterns to match. + Only directories with matching files will be included in the archive." } # zip::mkzip -- diff --git a/src/modules/punk/zip-999999.0a1.0.tm b/src/modules/punk/zip-999999.0a1.0.tm index 2ffa4454..26b4737b 100644 --- a/src/modules/punk/zip-999999.0a1.0.tm +++ b/src/modules/punk/zip-999999.0a1.0.tm @@ -575,42 +575,45 @@ tcl::namespace::eval punk::zip { "Create a zip archive in 'filename'" @opts -offsettype -default "archive" -choices {archive file}\ - -help "zip offsets stored relative to start of entire file or relative to start of zip-archive - Only relevant if the created file has a script/runtime prefix. - " + -help\ + "zip offsets stored relative to start of entire file or relative to start of zip-archive + Only relevant if the created file has a script/runtime prefix." -return -default "pretty" -choices {pretty list none}\ - -help "mkzip can return a list of the files and folders added to the archive - the option -return pretty is the default and uses the punk::lib pdict/plist system - to return a formatted list for the terminal + -help\ + "mkzip can return a list of the files and folders added to the archive + the option -return pretty is the default and uses the punk::lib pdict/plist system + to return a formatted list for the terminal " -zipkit -default 0 -type none\ - -help "whether to add mounting script - mutually exclusive with -runtime option - currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs - " + -help\ + "whether to add mounting script + mutually exclusive with -runtime option + currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs" -runtime -default ""\ - -help "specify a prefix file - e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip - will create a self-extracting zip archive from the subdir/ folder. - Expects runtime with no existing vfs attached (review) - " + -help\ + "specify a prefix file + e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip + will create a self-extracting zip archive from the subdir/ folder. + Expects runtime with no existing vfs attached (review)" -comment -default ""\ -help "An optional comment for the archive" -directory -default ""\ - -help "The new zip archive will scan for contents within this folder or current directory if not provided. - Note that this will - " + -help "Scan for contents within this folder or current directory if not provided." -base -default ""\ - -help "The new zip archive will be rooted in this directory if provided - it must be a parent of -directory or the same path as -directory" + -help\ + "The new zip archive will be rooted in this directory if provided + it must be a parent of -directory or the same path as -directory" -exclude -default {CVS/* */CVS/* *~ ".#*" "*/.#*"} + -- -type none -help\ + "End of options marker" @values -min 1 -max -1 filename -type file -default ""\ -help "name of zipfile to create" globs -default {*} -multiple 1\ - -help "list of glob patterns to match. - Only directories with matching files will be included in the archive." + -help\ + "list of glob patterns to match. + Only directories with matching files will be included in the archive." } # zip::mkzip -- diff --git a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm index 97bbe591..87863f88 100644 --- a/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm +++ b/src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm @@ -575,42 +575,45 @@ tcl::namespace::eval punk::zip { "Create a zip archive in 'filename'" @opts -offsettype -default "archive" -choices {archive file}\ - -help "zip offsets stored relative to start of entire file or relative to start of zip-archive - Only relevant if the created file has a script/runtime prefix. - " + -help\ + "zip offsets stored relative to start of entire file or relative to start of zip-archive + Only relevant if the created file has a script/runtime prefix." -return -default "pretty" -choices {pretty list none}\ - -help "mkzip can return a list of the files and folders added to the archive - the option -return pretty is the default and uses the punk::lib pdict/plist system - to return a formatted list for the terminal + -help\ + "mkzip can return a list of the files and folders added to the archive + the option -return pretty is the default and uses the punk::lib pdict/plist system + to return a formatted list for the terminal " -zipkit -default 0 -type none\ - -help "whether to add mounting script - mutually exclusive with -runtime option - currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs - " + -help\ + "whether to add mounting script + mutually exclusive with -runtime option + currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs" -runtime -default ""\ - -help "specify a prefix file - e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip - will create a self-extracting zip archive from the subdir/ folder. - Expects runtime with no existing vfs attached (review) - " + -help\ + "specify a prefix file + e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip + will create a self-extracting zip archive from the subdir/ folder. + Expects runtime with no existing vfs attached (review)" -comment -default ""\ -help "An optional comment for the archive" -directory -default ""\ - -help "The new zip archive will scan for contents within this folder or current directory if not provided. - Note that this will - " + -help "Scan for contents within this folder or current directory if not provided." -base -default ""\ - -help "The new zip archive will be rooted in this directory if provided - it must be a parent of -directory or the same path as -directory" + -help\ + "The new zip archive will be rooted in this directory if provided + it must be a parent of -directory or the same path as -directory" -exclude -default {CVS/* */CVS/* *~ ".#*" "*/.#*"} + -- -type none -help\ + "End of options marker" @values -min 1 -max -1 filename -type file -default ""\ -help "name of zipfile to create" globs -default {*} -multiple 1\ - -help "list of glob patterns to match. - Only directories with matching files will be included in the archive." + -help\ + "list of glob patterns to match. + Only directories with matching files will be included in the archive." } # zip::mkzip -- diff --git a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm index 97bbe591..87863f88 100644 --- a/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm +++ b/src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/zip-0.1.1.tm @@ -575,42 +575,45 @@ tcl::namespace::eval punk::zip { "Create a zip archive in 'filename'" @opts -offsettype -default "archive" -choices {archive file}\ - -help "zip offsets stored relative to start of entire file or relative to start of zip-archive - Only relevant if the created file has a script/runtime prefix. - " + -help\ + "zip offsets stored relative to start of entire file or relative to start of zip-archive + Only relevant if the created file has a script/runtime prefix." -return -default "pretty" -choices {pretty list none}\ - -help "mkzip can return a list of the files and folders added to the archive - the option -return pretty is the default and uses the punk::lib pdict/plist system - to return a formatted list for the terminal + -help\ + "mkzip can return a list of the files and folders added to the archive + the option -return pretty is the default and uses the punk::lib pdict/plist system + to return a formatted list for the terminal " -zipkit -default 0 -type none\ - -help "whether to add mounting script - mutually exclusive with -runtime option - currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs - " + -help\ + "whether to add mounting script + mutually exclusive with -runtime option + currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs" -runtime -default ""\ - -help "specify a prefix file - e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip - will create a self-extracting zip archive from the subdir/ folder. - Expects runtime with no existing vfs attached (review) - " + -help\ + "specify a prefix file + e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip + will create a self-extracting zip archive from the subdir/ folder. + Expects runtime with no existing vfs attached (review)" -comment -default ""\ -help "An optional comment for the archive" -directory -default ""\ - -help "The new zip archive will scan for contents within this folder or current directory if not provided. - Note that this will - " + -help "Scan for contents within this folder or current directory if not provided." -base -default ""\ - -help "The new zip archive will be rooted in this directory if provided - it must be a parent of -directory or the same path as -directory" + -help\ + "The new zip archive will be rooted in this directory if provided + it must be a parent of -directory or the same path as -directory" -exclude -default {CVS/* */CVS/* *~ ".#*" "*/.#*"} + -- -type none -help\ + "End of options marker" @values -min 1 -max -1 filename -type file -default ""\ -help "name of zipfile to create" globs -default {*} -multiple 1\ - -help "list of glob patterns to match. - Only directories with matching files will be included in the archive." + -help\ + "list of glob patterns to match. + Only directories with matching files will be included in the archive." } # zip::mkzip -- diff --git a/src/vfs/_vfscommon.vfs/modules/punk/zip-0.1.1.tm b/src/vfs/_vfscommon.vfs/modules/punk/zip-0.1.1.tm index 97bbe591..87863f88 100644 --- a/src/vfs/_vfscommon.vfs/modules/punk/zip-0.1.1.tm +++ b/src/vfs/_vfscommon.vfs/modules/punk/zip-0.1.1.tm @@ -575,42 +575,45 @@ tcl::namespace::eval punk::zip { "Create a zip archive in 'filename'" @opts -offsettype -default "archive" -choices {archive file}\ - -help "zip offsets stored relative to start of entire file or relative to start of zip-archive - Only relevant if the created file has a script/runtime prefix. - " + -help\ + "zip offsets stored relative to start of entire file or relative to start of zip-archive + Only relevant if the created file has a script/runtime prefix." -return -default "pretty" -choices {pretty list none}\ - -help "mkzip can return a list of the files and folders added to the archive - the option -return pretty is the default and uses the punk::lib pdict/plist system - to return a formatted list for the terminal + -help\ + "mkzip can return a list of the files and folders added to the archive + the option -return pretty is the default and uses the punk::lib pdict/plist system + to return a formatted list for the terminal " -zipkit -default 0 -type none\ - -help "whether to add mounting script - mutually exclusive with -runtime option - currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs - " + -help\ + "whether to add mounting script + mutually exclusive with -runtime option + currently vfs::zip based - todo - autodetect zipfs/vfs with pref for zipfs" -runtime -default ""\ - -help "specify a prefix file - e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip - will create a self-extracting zip archive from the subdir/ folder. - Expects runtime with no existing vfs attached (review) - " + -help\ + "specify a prefix file + e.g punk::zip::mkzip -runtime unzipsfx.exe -directory subdir -base subdir output.zip + will create a self-extracting zip archive from the subdir/ folder. + Expects runtime with no existing vfs attached (review)" -comment -default ""\ -help "An optional comment for the archive" -directory -default ""\ - -help "The new zip archive will scan for contents within this folder or current directory if not provided. - Note that this will - " + -help "Scan for contents within this folder or current directory if not provided." -base -default ""\ - -help "The new zip archive will be rooted in this directory if provided - it must be a parent of -directory or the same path as -directory" + -help\ + "The new zip archive will be rooted in this directory if provided + it must be a parent of -directory or the same path as -directory" -exclude -default {CVS/* */CVS/* *~ ".#*" "*/.#*"} + -- -type none -help\ + "End of options marker" @values -min 1 -max -1 filename -type file -default ""\ -help "name of zipfile to create" globs -default {*} -multiple 1\ - -help "list of glob patterns to match. - Only directories with matching files will be included in the archive." + -help\ + "list of glob patterns to match. + Only directories with matching files will be included in the archive." } # zip::mkzip --