Diff

Differences From Artifact [63e41b84b9]:

To Artifact [f2b9d8ad84]:


   161    161   			package require vfs::zip
   162    162   			set ::zip::max_header_seek 8192
   163    163   		}
   164    164   
   165    165   		# Now that the initialization is complete, mount the user VFS if needed
   166    166   		## Mount the VFS from the Shared Object
   167    167   		if {[info exists ::TCLKIT_INITVFS] && [info exists ::tclKitFilename]} {
   168         -			catch {
          168  +			if {![catch {
   169    169   				vfs::zip::Mount $::tclKitFilename "/.KITDLL_USER"
          170  +			}]} {
          171  +				if {[file exists "/.KITDLL_USER"]} {
          172  +					lappend auto_path [file normalize "/.KITDLL_USER/lib"]
          173  +				}
   170    174   			}
   171    175   		}
   172         -		lappend auto_path "/.KITDLL_USER/lib"
          176  +
   173    177   
   174    178   		## Mount the VFS from executable
   175    179   		if {[info exists ::TCLKIT_INITVFS]} {
   176         -			catch {
          180  +			if {![catch {
   177    181   				vfs::zip::Mount [info nameofexecutable] "/.KITDLL_APP"
          182  +			}]} {
          183  +				if {[file exists "/.KITDLL_APP"]} {
          184  +					lappend auto_path [file normalize "/.KITDLL_APP/lib"]
          185  +				}
   178    186   			}
   179    187   		}
   180         -		lappend auto_path "/.KITDLL_APP/lib"
   181    188   	}
   182    189   
   183    190   	# Clean up
   184    191   	unset -nocomplain ::zip::max_header_seek
   185    192   	unset -nocomplain ::TCLKIT_TYPE ::TCLKIT_INITVFS
   186    193   	unset -nocomplain ::TCLKIT_MOUNTPOINT ::TCLKIT_VFSSOURCE ::TCLKIT_MOUNTPOINT_VAR ::TCLKIT_VFSSOURCE_VAR
   187    194   	unset -nocomplain ::tclKitStorage ::tclKitStorage_fd ::tclKitFilename
   188    195   	unset -nocomplain ::tclkit_system_encoding
   189    196   }