Diff

Differences From Artifact [a33903368c]:

To Artifact [0506bc15b0]:


   124    124   			"set s [zlib decompress $s]\n"
   125    125   		"}\n"
   126    126   	"}\n"
   127    127   #endif /* KIT_STORAGE_MK4 */
   128    128   #ifdef KIT_STORAGE_ZIP
   129    129   	"set ::tclKitStorage \"zip\"\n"
   130    130   	"catch { load {} vfs }\n"
   131         -	"if {[lsearch -exact [vfs::filesystem info] [info nameofexecutable]] != -1} {"
   132         -		"set s \"\"\n"
          131  +	"if {![info exists s]} {\n"
          132  +		"catch {\n"
          133  +			"set bootfile [file join [info nameofexecutable] boot.tcl]\n"
          134  +			"if {[file exists $bootfile]} {\n"
          135  +				"set f [open $bootfile]\n"
          136  +				"set s [read $f]\n"
          137  +				"close $f\n"
          138  +			"}\n"
          139  +		"}\n"
   133    140   	"}\n"
   134    141   	"if {![info exists s]} {\n"
   135    142   #  include "zipvfs.tcl.h"
   136    143   		"catch {\n"
   137    144   			"set ::tclKitStorage_fd [::zip::open [info nameofexecutable]]\n"
   138         -		"} err\n"
   139         -		"if {![catch { ::zip::stat $::tclKitStorage_fd boot.tcl sb }]} {\n"
   140         -			"catch {\n"
   141         -				"seek $::tclKitStorage_fd $sb(ino)\n"
   142         -				"zip::Data $::tclKitStorage_fd sb s\n"
   143         -			"}\n"
          145  +			"::zip::stat $::tclKitStorage_fd boot.tcl sb\n"
          146  +			"seek $::tclKitStorage_fd $sb(ino)\n"
          147  +			"zip::Data $::tclKitStorage_fd sb s\n"
   144    148   		"}\n"
   145    149   	"}\n"
   146    150   #endif /* KIT_STORAGE_ZIP */
   147    151   	"if {![info exists s]} {\n"
   148    152   		"set f [open setup.tcl]\n"
   149    153   		"set s [read $f]\n"
   150    154   		"close $f\n"