[patch] Use dosym and fix a couple of typos

java-utils-2.eclass.patch (text/plain), 1.19 KB, created by Davide Pesavento (RETIRED) on 2009-05-15 10:25:15 UTC

diff -Naur a/java-utils-2.eclass b/java-utils-2.eclass
--- a/java-utils-2.eclass	2009-05-15 11:32:23.000000000 +0200
+++ b/java-utils-2.eclass	2009-05-15 12:17:35.000000000 +0200
@@ -432,10 +432,9 @@
 java-pkg_doso() {
 	debug-print-function ${FUNCNAME} $*
 
-	[[ ${#} -lt 1 ]] &&  "At least one argument required for ${FUNCNAME}"
 	java-pkg_check-phase install
 
-	[[ ${#} -lt 1 ]] &&  die "At least one argument required for ${FUNCNAME}"
+	[[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
 
 	java-pkg_init_paths_
 
@@ -453,10 +452,8 @@
 				debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
 			# otherwise make a symlink to the symlink's origin
 			else
-				# TODO use dosym
-				ln -s "$(readlink "${lib}")" \
-					"${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
-				debug-print "${lib} is a symlink, linking accordanly"
+				dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
+				debug-print "${lib} is a symlink, linking accordantly"
 			fi
 		# otherwise die
 		else
@@ -482,7 +479,7 @@
 
 	java-pkg_check-phase install
 
-	[[ ${#} -lt 1 ]] &&  "at least one argument needed"
+	[[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
 
 	java-pkg_init_paths_