--- trunk/opengl-update/opengl-update.sh	2007/11/14 18:20:10	621
+++ trunk/opengl-update/opengl-update.sh	2012/05/02 08:35:15	1812
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/opengl-update/opengl-update.sh,v 1.6 2007-11-14 18:20:10 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/opengl-update/opengl-update.sh,v 1.10 2007-11-14 19:19:16 niro Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 # Further modifications by Donnie Berkholz <spyderous@gentoo.org>
 # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
@@ -11,8 +11,6 @@
 # <niro@magellan-linux.de>
 #
 
-. /etc/init.d/functions
-
 hasq()
 {
 	local x
@@ -67,8 +65,8 @@
 	for dir in ${PREFIX}/lib{,32,64}/opengl/*
 	do
 		if [[ -d ${dir} ]] &&
-			[[ ${dir##*/} != global ]]
-			&& ! hasq ${dir##*/} ${implems}
+			[[ ${dir##*/} != global ]] &&
+			! hasq ${dir##*/} ${implems}
 		then
 			implems=${implems:+${implems} }${dir##*/}
 		fi
@@ -102,11 +100,13 @@
 Usage: ${0##*/} [<options>] <GL implementation>
        Set the opengl implementation.
        Valid options:
+       --help|-h|-?:       Prints this help.
+       --version:          Shows the version of this utility.
        --use-old:          If an implementation is already set, use that one.
        --prefix=<val>:     Set the source prefix (default: /usr)
        --dst-prefix=<val>: Set the destination prefix (default: /usr)
        --impl-headers:     Use headers provided by this implementation to
-                           override golbal ones provided by opengl-update.
+                           override global ones provided by opengl-update.
 
 Usage: ${0##*/} --get-implementation
        Print the current implementaion
@@ -197,7 +197,7 @@
 	done
 }
 
-set-new-implementation()
+set_new_implementation()
 {
 	local GL_IMPLEM=${1}
 	local GL_LOCAL
@@ -227,7 +227,7 @@
 			[[ -d ${PREFIX}/${LIBDIR}/opengl ]] || continue
 		else
 			[[ -d ${PREFIX}/${LIBDIR}/opengl ]] &&
-				! -h ${PREFIX}/${LIBDIR} ]] || continue
+				[[ ! -h ${PREFIX}/${LIBDIR} ]] || continue
 		fi
 
 		# Fallback on xorg if we don't have this implementation for this LIBDIR.
@@ -406,14 +406,14 @@
 		;;
 
 	old-implementation)
-		set-new-implementation ${CURRENT_GL_IMPLEM}
+		set_new_implementation ${CURRENT_GL_IMPLEM}
 		exit $?
 		;;
 
 	set-implementation)
 		if [[ -n ${NEW_GL_IMPLEM} ]]
 		then
-			set-new-implementation ${NEW_GL_IMPLEM}
+			set_new_implementation ${NEW_GL_IMPLEM}
 			exit $?
 		else
 			print_usage