From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 28 Aug 2010 13:29:15 +0000 (+0100)
Subject: where-vessels: better error message when missing --ocean --pirate and client
X-Git-Tag: 6.6.4~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=e428aea897f4bd2004a20fca6129aa328f096b2c

where-vessels: better error message when missing --ocean --pirate and client
---

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index bebdf79..2a946ef 100755
--- 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 }
-	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 ?"
 	}