From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-321911-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1Pv9V2-0005NH-BY
	for garchives@archives.gentoo.org; Thu, 03 Mar 2011 14:27:28 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7CA88E0230;
	Thu,  3 Mar 2011 14:27:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 3E61AE0230
	for <gentoo-commits@lists.gentoo.org>; Thu,  3 Mar 2011 14:27:21 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C50A01B40C6
	for <gentoo-commits@lists.gentoo.org>; Thu,  3 Mar 2011 14:27:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 3747B8006A
	for <gentoo-commits@lists.gentoo.org>; Thu,  3 Mar 2011 14:27:20 +0000 (UTC)
From: "Krzysztof Pawlik" <nelchael@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Krzysztof Pawlik" <nelchael@gentoo.org>
Message-ID: <8e0e7bf546861cd8b9baa81c96ee7b55c56642ee.nelchael@gentoo>
Subject: [gentoo-commits] dev/nelchael:master commit in: scripts/
X-VCS-Repository: dev/nelchael
X-VCS-Files: scripts/generate-userlibraries.sh
X-VCS-Directories: scripts/
X-VCS-Committer: nelchael
X-VCS-Committer-Name: Krzysztof Pawlik
X-VCS-Revision: 8e0e7bf546861cd8b9baa81c96ee7b55c56642ee
Date: Thu,  3 Mar 2011 14:27:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 889c4078e635db3b887af35230aa14da

commit:     8e0e7bf546861cd8b9baa81c96ee7b55c56642ee
Author:     Krzysztof Pawlik <none <AT> none>
AuthorDate: Thu Mar  3 14:27:12 2011 +0000
Commit:     Krzysztof Pawlik <nelchael <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 14:27:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Ddev/nelchael.git;a=
=3Dcommit;h=3D8e0e7bf5

Update.

---
 scripts/generate-userlibraries.sh |   38 ++++++++++++-------------------=
-----
 1 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/scripts/generate-userlibraries.sh b/scripts/generate-userlib=
raries.sh
index 9fc4cf7..b9335aa 100755
--- a/scripts/generate-userlibraries.sh
+++ b/scripts/generate-userlibraries.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
-# 2006, Krzysztof Pawlik - nelchael@gentoo.org
-#=20
+# 2006-2011, Krzysztof Pawlik - nelchael@gentoo.org
+#
 # This script generates file for User Libraries import for Eclipse.
 # You can find that option in:
 #  Window -> Preferences -> Java -> Build Path -> User Libraries
@@ -10,62 +10,50 @@
 #
=20
 function get_name() {
-
-	echo $(echo ${1} | sed -e 's,^.*/share/\(.*\)/package.env$,\1,')
-
+	echo "$(echo "${1}" | sed -e 's,^.*/share/\(.*\)/package.env$,\1,')"
 }
=20
 function get_desc() {
-
-	cat ${1} | grep ^DESCRIPTION | cut -d '=3D' -f 2- | sed -e 's/"//g' | s=
ed -e 's,--,,g'
-
+	grep ^DESCRIPTION "${1}" | cut -d '=3D' -f 2- | sed -e 's/"//g' | sed -=
e 's,--,,g'
 }
=20
 function get_libdir() {
-
-	cat ${1} | grep ^LIBRARY_PATH | cut -d '=3D' -f 2- | sed -e 's/"//g'
-
+	grep ^LIBRARY_PATH "${1}" | cut -d '=3D' -f 2- | sed -e 's/"//g'
 }
=20
 function find_source() {
-
-	find $(dirname ${1}) -name "*-src.zip" | head -n 1
-
+	find "$(dirname "${1}")" -name '*-src.zip' | head -n 1
 }
=20
 echo '<?xml version=3D"1.0" encoding=3D"UTF-8"?>'
 echo '<eclipse-userlibraries version=3D"2">'
=20
 for package in /usr/share/*/package.env; do
-
-	packageName=3D$(get_name ${package})
+	packageName=3D"$(get_name "${package}")"
=20
 	echo '  <library name=3D"'"${packageName}"'" systemlibrary=3D"false">'
-	echo '    <!-- '"$(get_desc ${package})"' -->'
+	echo '    <!-- '"$(get_desc "${package}")"' -->'
=20
 	gotSource=3Dno
=20
-	for jar in $(grep ^CLASSPATH ${package} | cut -d =3D -f 2- | sed -e 's/=
"//g' | sed -e 's/:/ /g'); do
-
+	for jar in $(grep ^CLASSPATH "${package}" | cut -d =3D -f 2- | sed -e '=
s/"//g' | sed -e 's/:/ /g'); do
 		echo -n '    <archive path=3D"'"${jar}"'"'
=20
-		if [[ -n "$(find_source ${package})" ]]; then
-			echo -n ' source=3D"'"$(find_source ${package})"'"'
+		if [[ -n "$(find_source "${package}")" ]]; then
+			echo -n ' source=3D"'"$(find_source "${package}")"'"'
 			gotSource=3Dyes
 		fi
=20
-		if [[ -n "$(get_libdir ${package})" ]]; then
-			echo -n ' nativelibpaths=3D"'"$(get_libdir ${package})"'"'
+		if [[ -n "$(get_libdir "${package}")" ]]; then
+			echo -n ' nativelibpaths=3D"'"$(get_libdir "${package}")"'"'
 		fi
=20
 		echo '/>'
-
 	done
=20
 	[[ "${gotSource}" =3D "no" ]] && echo "Package without source: ${packag=
eName}" >&2
=20
 	echo '  </library>'
-
 done
=20
 echo '</eclipse-userlibraries>'