chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
where-vessels: better error message when missing --ocean --pirate and client
[ypp-sc-tools.main.git]
/
yarrg
/
where-vessels
diff --git
a/yarrg/where-vessels
b/yarrg/where-vessels
index bebdf79f370f2869af534b220046dbb260217c64..2a946ef34c0a80e9852e954778c0940cd3ef0f15 100755
(executable)
--- a/
yarrg/where-vessels
+++ b/
yarrg/where-vessels
@@
-147,7
+147,13
@@
proc argdefaults {} {
set cmd {./yarrg --find-window-only --quiet}
if {[info exists ocean]} { lappend cmd --ocean $ocean }
if {[info exists pirate]} { lappend cmd --pirate $pirate }
set cmd {./yarrg --find-window-only --quiet}
if {[info exists ocean]} { lappend cmd --ocean $ocean }
if {[info exists pirate]} { lappend cmd --pirate $pirate }
- manyset [split [eval exec $cmd] " "] ocean pirate
+ if {[catch {
+ manyset [split [eval exec $cmd] " "] ocean pirate
+ } emsg]} {
+ puts stderr "yarrg: [string trim $emsg]"
+ puts stderr "Alternatively pass, --ocean and perhaps --pirate options to where-vessels"
+ exit 1
+ }
if {![llength $ocean] || ![llength $pirate]} {
error "$ocean $pirate ?"
}
if {![llength $ocean] || ![llength $pirate]} {
error "$ocean $pirate ?"
}