Diff

Differences From Artifact [60eb9576ab]:

To Artifact [a3124557c2]:


   205    205   	TCLKIT="${TCLKIT:-tclkit}"
   206    206   	if echo 'exit 0' | "${TCLKIT}" >/dev/null 2>/dev/null; then
   207    207   		## Install using existing Tclkit
   208    208   		### Call installer
   209    209   		echo "Running: \"${TCLKIT}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\" \"${KITTARGET_NAME}.new\""
   210    210   		"${TCLKIT}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" "${KITTARGET_NAME}.new" || exit 1
   211    211   	else
   212         -		if echo 'exit 0' | ./kit >/dev/null 2>/dev/null; then
          212  +		if echo 'exit 0' | "${KITTARGET_NAME}" >/dev/null 2>/dev/null; then
   213    213   			## Bootstrap (cannot cross-compile)
   214    214   			### Call installer
   215    215   			echo "set argv [list {${KITTARGET_NAME}} starpack.vfs {${ENABLECOMPRESSION}} {${KITTARGET_NAME}.new}]" > setup.tcl
   216    216   			echo 'if {[catch { clock seconds }]} { proc clock args { return 0 } }' >> setup.tcl
   217    217   			echo 'source installvfs.tcl' >> setup.tcl
   218    218   
   219         -			echo 'Running: echo | ./kit setup.tcl'
   220         -			echo | ./kit setup.tcl || exit 1
          219  +			echo 'Running: echo | \"${KITTARGET_NAME}\" setup.tcl'
          220  +			echo | "${KITTARGET_NAME}" setup.tcl || exit 1
   221    221   		else
   222    222   			## Install using Tclsh, which may work if we're not using Metakit
   223    223   			### Call installer
   224    224   			echo "Running: \"${TCLSH_NATIVE}\" installvfs.tcl \"${KITTARGET_NAME}\" starpack.vfs \"${ENABLECOMPRESSION}\" \"${KITTARGET_NAME}.new\""
   225    225   			"${TCLSH_NATIVE}" installvfs.tcl "${KITTARGET_NAME}" starpack.vfs "${ENABLECOMPRESSION}" "${KITTARGET_NAME}.new" || exit 1
   226    226   		fi
   227    227   	fi
................................................................................
   229    229   	cat "${KITTARGET_NAME}.new" > "${KITTARGET_NAME}" || exit 1
   230    230   	rm -f "${KITTARGET_NAME}.new"
   231    231   
   232    232   	# Cleanup
   233    233   	if [ "${KITTARGET}" = "kitdll" ]; then
   234    234   		## Remove built interpreters if we are building KitDLL --
   235    235   		## they're just tiny stubs anyway
   236         -		rm -f kit
          236  +		rm -f "${KITTARGET_NAME}"
   237    237   	fi
   238    238   
   239    239   	exit 0
   240    240   ) || exit 1
   241    241   
   242    242   exit 0