better wrapper script #29617

5 files changed, 18 insertions, 46 deletions

diff --git a/games-board/cgoban2/ChangeLog b/games-board/cgoban2/ChangeLog
index 8268e8d1907b..d92bcf63b647 100644
--- a/games-board/cgoban2/ChangeLog
+++ b/games-board/cgoban2/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for games-board/cgoban2
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/ChangeLog,v 1.2 2003/09/10 20:23:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/ChangeLog,v 1.3 2003/09/27 01:19:12 vapier Exp $
 
 *cgoban2-2.5.1 (17 Jul 2003)
 
+  26 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add wrapper script to show nicer errors #29617.
+
   17 Jul 2003; Michael Sterrett <msterret@gentoo.org> cgoban2-2.5.1.ebuild:
   version bump (bug 24663)
 
diff --git a/games-board/cgoban2/cgoban2-2.4.61.ebuild b/games-board/cgoban2/cgoban2-2.4.61.ebuild
deleted file mode 100644
index d5f25c141b36..000000000000
--- a/games-board/cgoban2/cgoban2-2.4.61.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/cgoban2-2.4.61.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
-
-inherit games
-
-DESCRIPTION="A Java client for the Kiseido Go Server, and a SGF editor"
-HOMEPAGE="http://kgs.kiseido.com/"
-SRC_URI="http://kgs.kiseido.com/cgoban-unix-${PV}.tar.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86"
-
-RDEPEND=">=virtual/jre-1.3
-	virtual/x11"
-
-S=${WORKDIR}/cgoban
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed \
-		-e 's;_DIR=.;_DIR='"${GAMES_DATADIR}/${PN}"';' \
-		< cgoban.sh.in > cgoban2 || die "sed cgoban.sh.in failed"
-}
-
-src_install() {
-	dogamesbin cgoban2
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins cgoban.jar
-	prepgamesdirs
-}
diff --git a/games-board/cgoban2/cgoban2-2.5.1.ebuild b/games-board/cgoban2/cgoban2-2.5.1.ebuild
index e7d64b8a50bd..0e1a1b322f22 100644
--- a/games-board/cgoban2/cgoban2-2.5.1.ebuild
+++ b/games-board/cgoban2/cgoban2-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/cgoban2-2.5.1.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/cgoban2-2.5.1.ebuild,v 1.2 2003/09/27 01:19:14 vapier Exp $
 
 inherit games
 
@@ -17,17 +17,10 @@ RDEPEND=">=virtual/jre-1.3
 
 S=${WORKDIR}/cgoban
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed \
-		-e 's;_DIR=.;_DIR='"${GAMES_DATADIR}/${PN}"';' \
-		< cgoban.sh.in > cgoban2 || die "sed cgoban.sh.in failed"
-}
-
 src_install() {
-	dogamesbin cgoban2
-	insinto "${GAMES_DATADIR}/${PN}"
+	dogamesbin ${FILESDIR}/cgoban2
+	dosed "s:GENTOO_DIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/cgoban2
+	insinto ${GAMES_DATADIR}/${PN}
 	doins cgoban.jar
 	prepgamesdirs
 }
diff --git a/games-board/cgoban2/files/cgoban2 b/games-board/cgoban2/files/cgoban2
new file mode 100644
index 000000000000..f5f054f53433
--- /dev/null
+++ b/games-board/cgoban2/files/cgoban2
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd GENTOO_DIR
+javabin="`which java 2>/dev/null`"
+if [ -z "${javabin}" ] ; then
+	echo "No 'java' binary found."
+	echo "You should run 'java-config' to choose your default VM."
+	exit 1
+else
+	exec java -jar cgoban.jar "$@"
+fi
diff --git a/games-board/cgoban2/files/digest-cgoban2-2.4.61 b/games-board/cgoban2/files/digest-cgoban2-2.4.61
deleted file mode 100644
index b3b539e7433a..000000000000
--- a/games-board/cgoban2/files/digest-cgoban2-2.4.61
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8440400400a2e0bc8f37086e5dc9d7e6 cgoban-unix-2.4.61.tar.bz2 863301