Index: client/pkgd.eagle ================================================================== --- client/pkgd.eagle +++ client/pkgd.eagle @@ -18,10 +18,32 @@ # 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. # @@ -265,10 +287,16 @@ } return $downloadDirectories } + # + # 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] + # # NOTE: Setup the variables, within this namespace, used by this script. # setupDownloadVars Index: client/pkgd.eagle.harpy ================================================================== --- client/pkgd.eagle.harpy +++ client/pkgd.eagle.harpy @@ -19,32 +19,32 @@ None Mistachkin Systems - b7e83a89-b5ab-4c72-950e-5d0d6f29ab7d + bf96387a-3231-489d-9266-59ef6b7fa8a6 SHA512 Script - 2016-08-19T02:26:09.3779766Z + 2016-08-19T02:31:02.1650859Z -1.00:00:00 0x2c322765603b5278 - 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 Index: client/pkgr.eagle ================================================================== --- client/pkgr.eagle +++ client/pkgr.eagle @@ -1159,11 +1159,12 @@ # # 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. + # file. An identical procedure is defined in the package downloader + # client. # 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 - 4e5a63d2-af93-4521-9477-bd723121aa3a + a1c4c2da-a7cb-4d62-94cc-cef93fc1c5ef SHA512 Script - 2016-08-19T01:36:23.6406719Z + 2016-08-19T02:30:38.2090312Z -1.00:00:00 0x2c322765603b5278 - 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