Index: client/pkgr.eagle ================================================================== --- client/pkgr.eagle +++ client/pkgr.eagle @@ -319,14 +319,14 @@ # # NOTE: Grab the package script. If it is an empty string, then the # package cannot be loaded and there is nothing to do. In that # case, just raise an error. # - set ifNeeded [getDictionaryValue $result IfNeeded] + set script [getDictionaryValue $result Script] - if {[string length $ifNeeded] == 0} then { - error "missing ifneeded script" + if {[string length $script] == 0} then { + error "missing script" } # # NOTE: Grab the package script certificate. If it is an empty string # then the package script is unsigned, which is not allowed by @@ -365,11 +365,11 @@ # if {[string length $varName] > 0} then { upvar 1 $varName metadata set metadata(language) $language - set metadata(ifNeeded) $ifNeeded + set metadata(script) $script set metadata(certificate) $certificate } } proc tclMustBeReady {} { @@ -445,12 +445,12 @@ } # # NOTE: If the package script is mising, fail. # - if {![info exists metadata(ifNeeded)]} then { - error "missing ifneeded script" + if {![info exists metadata(script)]} then { + error "missing script" } # # NOTE: If the package script certificate is mising, fail. # @@ -514,14 +514,14 @@ %metadata% $newVarName(1) %cleanup% $newVarName(2) \ %eagleHasSecurity% $newProcName(1) %getFileTempName% \ $newProcName(2) %tclMustBeReady% $newProcName(3)] { try { # - # NOTE: If there is no package ifneeded script, there is nothing we + # NOTE: If there is no package script, there is nothing we # can do here. # - if {[string length ${%metadata%(ifNeeded)}] > 0} then { + if {[string length ${%metadata%(script)}] > 0} then { # # NOTE: Save the security state for the interpreter. Then, attempt # to enable it. This will fail if one of the needed plugins # cannot be loaded. # @@ -538,11 +538,11 @@ try { # # NOTE: Write downloaded script to a temporary file. # - writeFile $fileName(1) ${%metadata%(ifNeeded)} + writeFile $fileName(1) ${%metadata%(script)} # # NOTE: Write downloaded script certificate to a temporary # file. # @@ -650,14 +650,14 @@ return [eagle $script(outer)] } } elseif {[isPgpSignature $metadata(certificate)]} then { # - # NOTE: If there is no package ifneeded script, there is nothing we + # NOTE: If there is no package script, there is nothing we # can do here. # - if {[string length $metadata(ifNeeded)] > 0} then { + if {[string length $metadata(script)] > 0} then { # # NOTE: Figure out temporary file name for the downloaded script # and its associated PGP signature. # set fileName(1) [getFileTempName] @@ -664,11 +664,11 @@ set fileName(2) [appendArgs $fileName(1) .asc] # # NOTE: Write downloaded script to a temporary file. # - writeFile $fileName(1) $metadata(ifNeeded) + writeFile $fileName(1) $metadata(script) # # NOTE: Write downloaded script PGP signature a temporary file. # if {[string length $metadata(certificate)] > 0} then { @@ -700,11 +700,11 @@ # # NOTE: The PGP signature was verified; use the downloaded package # script verbatim. # - set script(inner) $metadata(ifNeeded) + set script(inner) $metadata(script) # # NOTE: Determine the target language for the package script, which # may or may not be the language that is currently evaluating # this script (Eagle). The default language, when one was not @@ -872,15 +872,15 @@ if {[string length $version] > 0} then {lappend command $version} if {[catch $command] == 0} then { pkgLog [appendArgs \ "package \"" [formatPackageName $package $version] \ - "\" was loaded."] + "\" was loaded"] } else { pkgLog [appendArgs \ "package \"" [formatPackageName $package $version] \ - "\" was not loaded."] + "\" was not loaded"] } } } proc maybeReadSettingsFile { script } { Index: client/pkgr.eagle.harpy ================================================================== --- client/pkgr.eagle.harpy +++ client/pkgr.eagle.harpy @@ -19,32 +19,32 @@ None Mistachkin Systems - 78255941-0cb7-4f55-8dd9-abe50e72170a + 3568d473-0bb6-4f90-be5f-8b450f8736d7 SHA512 Script - 2016-08-17T19:22:59.0896016Z + 2016-08-17T20:05:49.0964375Z -1.00:00:00 0x2c322765603b5278 - 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