aboutsummaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-02-03 21:36:54 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-02-03 21:36:54 +0000
commitf463131e856be18119f69ad3ab083dbf8db73ec3 (patch)
treef26f95753d634155b0ed3b4f855a276c180c58bf /eclass
parentFixed running unzip. (diff)
downloadjava-f463131e856be18119f69ad3ab083dbf8db73ec3.tar.gz
java-f463131e856be18119f69ad3ab083dbf8db73ec3.tar.bz2
java-f463131e856be18119f69ad3ab083dbf8db73ec3.zip
Style fixes.
svn path=/gentoo-java-experimental/; revision=1886
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-wsdp.eclass15
1 files changed, 5 insertions, 10 deletions
diff --git a/eclass/java-wsdp.eclass b/eclass/java-wsdp.eclass
index 741ad08e..9863a951 100644
--- a/eclass/java-wsdp.eclass
+++ b/eclass/java-wsdp.eclass
@@ -54,7 +54,7 @@ java-wsdp_pkg_setup() {
# `tail +<number>` syntax, and... breaks, so:
java-wsdp_src_unpack() {
- einfo "Extracting zip file..."
+ ebegin "Extracting zip file"
mkdir "${T}/unpacked" || die "mkdir failed"
# This tries to figure out right offset from `tail +<number>`:
@@ -67,15 +67,16 @@ java-wsdp_src_unpack() {
# And finally unpack it:
cd "${T}/unpacked/"
unzip -qq "packed.zip" || die "unzip failed"
+ eend 0
# Now the Sun's installer is run to get the files:
- einfo "Installing using Sun's installer, please wait..."
+ ebegin "Installing using Sun's installer, please wait"
cd "${T}/unpacked/"
java JWSDP -silent -P installLocation="${WORKDIR}/base" || die "java failed"
+ eend 0
# A little cleanup (remove unneeded files like uninstaller, images for it,
# bundled ant:
- einfo "Removing useless files..."
cd "${WORKDIR}/base"
rm -fr _uninst uninstall.sh images apache-ant
@@ -83,7 +84,6 @@ java-wsdp_src_unpack() {
java-wsdp_src_install() {
- einfo "Installing ${JWSDP_PKG}..."
cd "${WORKDIR}/base/${JWSDP_PKG}"
# Remove existing compiled jars that belong to other packages (ebuild has to
@@ -96,12 +96,7 @@ java-wsdp_src_install() {
java-pkg_dojar lib/*.jar
if use doc; then
- if [[ -d docs ]]; then
- einfo "Installing documentation..."
- java-pkg_dohtml -r docs/*
- else
- einfo "No docs directory"
- fi
+ [[ -d docs ]] && java-pkg_dohtml -r docs/*
fi
}