Overview
| Comment: | Consistently check for the 'openPgpFileNameOnly' variable before trying to use it. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | openPgpVars |
| Files: | files | file ages | folders |
| SHA1: |
195273da17a42b77b28186634ffbaaec |
| User & Date: | mistachkin on 2017-08-10 02:55:27 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-08-10
| ||
| 17:46 | Improvements to the OpenPGP (e.g. GPG) integration. check-in: 9c00913b70 user: mistachkin tags: trunk | |
| 02:55 | Consistently check for the 'openPgpFileNameOnly' variable before trying to use it. Closed-Leaf check-in: 195273da17 user: mistachkin tags: openPgpVars | |
| 02:42 | Modify the 'openPgpMustBeInstalled' procedure so that it can support checking for both the 'gpg2' and 'gpg' executables, in that order. check-in: 12a6ce4b8c user: mistachkin tags: openPgpVars | |
Changes
Modified client/1.0/neutral/pkgr.eagle from [9f02f489ad] to [4084937617].
| ︙ | ︙ | |||
398 399 400 401 402 403 404 405 406 407 408 409 410 411 |
global env
variable openPgpFileNameOnly
variable openPgpInstalledDirectory
if {[catch {openPgpMustBeInstalled}] == 0} then {
return true
}
if {![info exists openPgpInstalledDirectory]} then {
return false
}
if {[isWindows]} then {
if {[info exists env(ProgramFiles(x86))]} then {
| > > > > | 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 |
global env
variable openPgpFileNameOnly
variable openPgpInstalledDirectory
if {[catch {openPgpMustBeInstalled}] == 0} then {
return true
}
if {![info exists openPgpFileNameOnly]} then {
return false
}
if {![info exists openPgpInstalledDirectory]} then {
return false
}
if {[isWindows]} then {
if {[info exists env(ProgramFiles(x86))]} then {
|
| ︙ | ︙ | |||
421 422 423 424 425 426 427 |
set directory $openPgpInstalledDirectory
}
if {![file isdirectory $directory]} then {
return false
}
| < < < < | 425 426 427 428 429 430 431 432 433 434 435 436 437 438 |
set directory $openPgpInstalledDirectory
}
if {![file isdirectory $directory]} then {
return false
}
set fileName [file join $directory $openPgpFileNameOnly]
if {[file exists $fileName] && [file isfile $fileName]} then {
return [addToPath $directory]
}
return false
|
| ︙ | ︙ | |||
528 529 530 531 532 533 534 535 536 537 538 539 540 541 |
# the fully qualified path and file name of the OpenPGP signature
# file to verify.
#
# <public>
proc verifyOpenPgpSignature { fileName } {
variable openPgpFileNameOnly
variable openPgpVerifyCommand
if {[isEagle]} then {
set fileName [formatExecArgument $fileName]
if {[catch {
eval exec -success Success [subst $openPgpVerifyCommand]
}] == 0} then {
| > > > > | 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 |
# the fully qualified path and file name of the OpenPGP signature
# file to verify.
#
# <public>
proc verifyOpenPgpSignature { fileName } {
variable openPgpFileNameOnly
variable openPgpVerifyCommand
if {![info exists openPgpFileNameOnly]} then {
return false
}
if {[isEagle]} then {
set fileName [formatExecArgument $fileName]
if {[catch {
eval exec -success Success [subst $openPgpVerifyCommand]
}] == 0} then {
|
| ︙ | ︙ | |||
634 635 636 637 638 639 640 641 642 643 644 645 646 647 |
# qualified path and file name of the file to be signed.
#
# <public>
proc createOpenPgpSignature { fileName } {
global env
variable openPgpFileNameOnly
variable openPgpSignCommand
if {[isEagle]} then {
set fileName [formatExecArgument $fileName]
if {[catch {
eval exec -success Success [subst $openPgpSignCommand]
}] == 0} then {
| > > > > | 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 |
# qualified path and file name of the file to be signed.
#
# <public>
proc createOpenPgpSignature { fileName } {
global env
variable openPgpFileNameOnly
variable openPgpSignCommand
if {![info exists openPgpFileNameOnly]} then {
return false
}
if {[isEagle]} then {
set fileName [formatExecArgument $fileName]
if {[catch {
eval exec -success Success [subst $openPgpSignCommand]
}] == 0} then {
|
| ︙ | ︙ | |||
669 670 671 672 673 674 675 676 677 678 679 680 681 682 |
# of this package.
#
# <internal>
proc importOpenPgpKeyFile { fileName varName } {
variable openPgpFileNameOnly
variable openPgpImportCommand
variable openPgpImportPattern
if {[string length $varName] > 0} then {
upvar 1 $varName result
}
if {[isEagle]} then {
set fileName [formatExecArgument $fileName]
| > > > > | 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 |
# of this package.
#
# <internal>
proc importOpenPgpKeyFile { fileName varName } {
variable openPgpFileNameOnly
variable openPgpImportCommand
variable openPgpImportPattern
if {![info exists openPgpFileNameOnly]} then {
return false
}
if {[string length $varName] > 0} then {
upvar 1 $varName result
}
if {[isEagle]} then {
set fileName [formatExecArgument $fileName]
|
| ︙ | ︙ |