summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Baidakou <the.dmol@gmail.com>2012-09-08 18:42:42 +0300
committerIvan Baidakou <the.dmol@gmail.com>2012-09-08 18:42:42 +0300
commit73d302a4cceb4a67e4496c7617d9900ea1a6cfd4 (patch)
treefb4379c1aad8e578857978df7842500b729d4aff /dev-db/hsqldb/hsqldb-2.2.8.ebuild
parentfix installation for xml-beans (diff)
downloaddmol-73d302a4cceb4a67e4496c7617d9900ea1a6cfd4.tar.gz
dmol-73d302a4cceb4a67e4496c7617d9900ea1a6cfd4.tar.bz2
dmol-73d302a4cceb4a67e4496c7617d9900ea1a6cfd4.zip
add die calls to sed statements
Diffstat (limited to 'dev-db/hsqldb/hsqldb-2.2.8.ebuild')
-rw-r--r--dev-db/hsqldb/hsqldb-2.2.8.ebuild10
1 files changed, 5 insertions, 5 deletions
diff --git a/dev-db/hsqldb/hsqldb-2.2.8.ebuild b/dev-db/hsqldb/hsqldb-2.2.8.ebuild
index 65a7d11..80c6ce0 100644
--- a/dev-db/hsqldb/hsqldb-2.2.8.ebuild
+++ b/dev-db/hsqldb/hsqldb-2.2.8.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
+inherit user java-pkg-2 java-ant-2
DESCRIPTION="The leading SQL relational database engine written in Java."
HOMEPAGE="http://hsqldb.org/"
@@ -56,7 +56,7 @@ java_prepare() {
mkdir conf
sed -e "s/^server.database.0=.*$/server.database.0=file:${HSQLDB_HOME//\//\\/}\/db0/g" \
- sample/server.properties > conf/server.properties
+ sample/server.properties > conf/server.properties || die
cp "${FILESDIR}/hsqldb-${SLOT}.conf" "conf/hsqldb-${SLOT}"
cp conf/server.properties conf/webserver.properties
sed -e '/^$/{N; /# Each server.database.X/ i \
@@ -65,7 +65,7 @@ java_prepare() {
server.port=8080\
}' \
- conf/server.properties > conf/webserver.properties
+ conf/server.properties > conf/webserver.properties || die
sed -e '/^$/{N; /# Template for a urlid for an Oracle database/ i\
# This is for a hsqldb Web Server running with default settings on your local \
# computer (and for which you have not changed the password for "SA"). \
@@ -77,12 +77,12 @@ password \
\
}' \
- sample/sqltool.rc > conf/sqltool.rc
+ sample/sqltool.rc > conf/sqltool.rc || die
}
EANT_TEST_GENTOO_CLASSPATH="servlet-api-3.0,junit" #,ant-core"
EANT_TEST_TARGET="hsqldbtest" #preprocessor"
-EANT_TEST_EXTRA_ARGS="-D_junit_available=true" #-Djunit.available=true"
+EANT_TEST_EXTRA_ARGS="-D_junit_available=true"
src_test() {
java-pkg-2_src_test