Index: client/pkgd.eagle ================================================================== --- client/pkgd.eagle +++ client/pkgd.eagle @@ -18,32 +18,10 @@ # NOTE: Use our own namespace here because even though we do not directly # support namespaces ourselves, we do not want to pollute the global # namespace if this script actually ends up being evaluated in Tcl. # namespace eval ::PackageDownloader { - # - # NOTE: This procedure evaluates the package downloader client settings - # script file, if it exists. Any script errors raised are not - # masked. The script argument must be the fully qualified path - # and file name for the primary package downloader client script - # file. An identical procedure is defined in the package repository - # client. - # - proc maybeReadSettingsFile { script } { - if {[string length $script] == 0 || \ - ![file exists $script] || ![file isfile $script]} then { - return - } - - set fileName [appendArgs \ - [file rootname $script] .settings [file extension $script]] - - if {[file exists $fileName] && [file isfile $fileName]} then { - uplevel 1 [list source $fileName] - } - } - # # NOTE: This procedure sets up the default values for all configuration # parameters used by the package downloader client. There are no # arguments. # @@ -287,27 +265,27 @@ } return $downloadDirectories } + # + # NOTE: This package requires the package repository client package. + # + package require Eagle.Package.Repository + # # NOTE: Attempt to read optional settings file now. This may override # one or more of the variable setup in the next step. # - maybeReadSettingsFile [info script] + ::PackageRepository::maybeReadSettingsFile [info script] # # NOTE: Setup the variables, within this namespace, used by this script. # setupDownloadVars - # - # NOTE: This package requires the package repository client package. - # - package require Eagle.Package.Repository - # # NOTE: Provide the package to the interpreter. # package provide Eagle.Package.Downloader \ [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}] } Index: client/pkgd.eagle.harpy ================================================================== --- client/pkgd.eagle.harpy +++ client/pkgd.eagle.harpy @@ -19,32 +19,32 @@ None Mistachkin Systems - bf96387a-3231-489d-9266-59ef6b7fa8a6 + 53a7ee35-d269-407b-9849-062af5a64876 SHA512 Script - 2016-08-19T02:31:02.1650859Z + 2016-08-19T02:47:10.2744609Z -1.00:00:00 0x2c322765603b5278 - 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 Index: client/pkgr.eagle ================================================================== --- client/pkgr.eagle +++ client/pkgr.eagle @@ -1159,12 +1159,11 @@ # # NOTE: This procedure evaluates the package repository client settings # script file, if it exists. Any script errors raised are not # masked. The script argument must be the fully qualified path # and file name for the primary package repository client script - # file. An identical procedure is defined in the package downloader - # client. + # file. # proc maybeReadSettingsFile { script } { if {[string length $script] == 0 || \ ![file exists $script] || ![file isfile $script]} then { return Index: client/pkgr.eagle.harpy ================================================================== --- client/pkgr.eagle.harpy +++ client/pkgr.eagle.harpy @@ -19,32 +19,32 @@ None Mistachkin Systems - a1c4c2da-a7cb-4d62-94cc-cef93fc1c5ef + 88d42a28-1e95-4dd7-aaf9-11bb262f10d0 SHA512 Script - 2016-08-19T02:30:38.2090312Z + 2016-08-19T02:47:51.4043437Z -1.00:00:00 0x2c322765603b5278 - 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