Index: Setup/verify.eagle ================================================================== --- Setup/verify.eagle +++ Setup/verify.eagle @@ -23,14 +23,10 @@ } proc getSha1Hashes { varName } { variable fossil - if {![file exists $fossil]} then { - usage [appendArgs "tool \"" $fossil "\" is missing"] - } - upvar 1 $varName hashes set data [exec -success Success -nocarriagereturns -- \ $fossil artifact current] @@ -52,14 +48,10 @@ } proc getSha1Sum { fileName } { variable fossil - if {![file exists $fossil]} then { - usage [appendArgs "tool \"" $fossil "\" is missing"] - } - return [string range [exec -success Success -nocarriagereturns \ -trimall -- $fossil sha1sum $fileName] 0 39] } set argc [llength $argv] @@ -147,12 +139,18 @@ if {![file isdirectory $extractDirectory]} then { usage [appendArgs \ "extract directory \"" $extractDirectory "\" does not exist"] } - if {[getSha1Hashes hashes] == 0} then { - usage "no repository hashes are available" + if {$withHashes} then { + if {![file exists $fossil]} then { + usage [appendArgs "tool \"" $fossil "\" is missing"] + } + + if {[getSha1Hashes hashes] == 0} then { + usage "no repository hashes are available" + } } set archiveFileNames [list] foreach extension [list exe rar zip] {