[gentoo-commits] dev/nelchael:master commit in: scripts/

[Krzysztof Pawlik]

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=dev/nelchael.git;a=commit;h=8e0e7bf5

Update.

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

diff --git a/scripts/generate-userlibraries.sh b/scripts/generate-userlibraries.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@g.o
-# 
+# 2006-2011, Krzysztof Pawlik - nelchael@g.o
+#
 # 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 @@
 #
 
 function get_name() {
-
-	echo $(echo ${1} | sed -e 's,^.*/share/\(.*\)/package.env$,\1,')
-
+	echo "$(echo "${1}" | sed -e 's,^.*/share/\(.*\)/package.env$,\1,')"
 }
 
 function get_desc() {
-
-	cat ${1} | grep ^DESCRIPTION | cut -d '=' -f 2- | sed -e 's/"//g' | sed -e 's,--,,g'
-
+	grep ^DESCRIPTION "${1}" | cut -d '=' -f 2- | sed -e 's/"//g' | sed -e 's,--,,g'
 }
 
 function get_libdir() {
-
-	cat ${1} | grep ^LIBRARY_PATH | cut -d '=' -f 2- | sed -e 's/"//g'
-
+	grep ^LIBRARY_PATH "${1}" | cut -d '=' -f 2- | sed -e 's/"//g'
 }
 
 function find_source() {
-
-	find $(dirname ${1}) -name "*-src.zip" | head -n 1
-
+	find "$(dirname "${1}")" -name '*-src.zip' | head -n 1
 }
 
 echo '<?xml version="1.0" encoding="UTF-8"?>'
 echo '<eclipse-userlibraries version="2">'
 
 for package in /usr/share/*/package.env; do
-
-	packageName=$(get_name ${package})
+	packageName="$(get_name "${package}")"
 
 	echo '  <library name="'"${packageName}"'" systemlibrary="false">'
-	echo '    <!-- '"$(get_desc ${package})"' -->'
+	echo '    <!-- '"$(get_desc "${package}")"' -->'
 
 	gotSource=no
 
-	for jar in $(grep ^CLASSPATH ${package} | cut -d = -f 2- | sed -e 's/"//g' | sed -e 's/:/ /g'); do
-
+	for jar in $(grep ^CLASSPATH "${package}" | cut -d = -f 2- | sed -e 's/"//g' | sed -e 's/:/ /g'); do
 		echo -n '    <archive path="'"${jar}"'"'
 
-		if [[ -n "$(find_source ${package})" ]]; then
-			echo -n ' source="'"$(find_source ${package})"'"'
+		if [[ -n "$(find_source "${package}")" ]]; then
+			echo -n ' source="'"$(find_source "${package}")"'"'
 			gotSource=yes
 		fi
 
-		if [[ -n "$(get_libdir ${package})" ]]; then
-			echo -n ' nativelibpaths="'"$(get_libdir ${package})"'"'
+		if [[ -n "$(get_libdir "${package}")" ]]; then
+			echo -n ' nativelibpaths="'"$(get_libdir "${package}")"'"'
 		fi
 
 		echo '/>'
-
 	done
 
 	[[ "${gotSource}" = "no" ]] && echo "Package without source: ${packageName}" >&2
 
 	echo '  </library>'
-
 done
 
 echo '</eclipse-userlibraries>'