Removing opengl-update-livecd (finally) and updating openglify to work with x11-misc/opengl-update.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@54 7bf51bff-881f-0410-a643-fba68b97345e

2 files changed, 15 insertions, 117 deletions

diff --git a/opengl-update-livecd b/opengl-update-livecd
deleted file mode 100755
index 92d2f38..0000000
--- a/opengl-update-livecd
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo/src/livecd-tools/Attic/opengl-update-livecd,v 1.6 2005/05/26 15:27:01 wolf31o2 Exp $
-
-source /etc/init.d/functions.sh
-
-if [ $(id -u) -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-usage() {
-cat << FOO
-usage: opengl-update-livecd <GL implementation>
-
-note:  
-       This utility switch between OpenGL implementations.  Currently there
-       are three supported implementations, namely "xorg-x11", "nvidia", and
-	   "ati", the implementations for X.Org, and the NVidia and ATI drivers
-	   respectively.
-
-examples:
-       opengl-update-livecd xorg-x11
-       This will setup things to use libGL.so from X.Org
-
-       opengl-update-livecd nvidia
-       This will setup things to use libGL.so from the NVidia drivers.
-
-	   opengl-update-livecd ati
-	   This will setup things to use libGL.so from the ATI drivers.
-	   
-FOO
-	exit 1
-}
-
-if [ $# -ne 1 ]
-then
-	usage
-fi
-if [ ! -d /usr/lib/opengl/${1} ]
-then
-	usage
-else
-	ebegin "Switching to ${1} OpenGL interface"
-
-	#set up the $LDPATH
-	echo "LDPATH=/usr/lib/opengl/${1}/lib" >/etc/env.d/09opengl
-	/usr/sbin/env-update &>/dev/null
-
-	#setup the /usr/lib/libGL.so symlink
-	rm -f /etc/opengl/libGL.so /etc/opengl/libGL.so.1
-	
-	realname="$(readlink /usr/lib/opengl/${1}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/etc/opengl/libGL.so
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/etc/opengl/libGL.so.1
-
-	#setup the /usr/lib/libMesaGL.so symlink
-	rm -f /etc/opengl/libMesaGL.so
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/etc/opengl/libMesaGL.so
-
-	rm -f /etc/opengl/libGLcore.so*
-	
-	if [ -e /usr/lib/opengl/${1}/lib/libGLcore.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${1}/lib/libGLcore.so)"
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/etc/opengl/libGLcore.so
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/etc/opengl/libGLcore.so.1
-	fi
-
-	#setup the /usr/lib/modules/extensions/libglx.so symlink
-	rm -f /etc/opengl/libglx.*
-	
-	if [ -e /usr/lib/opengl/${1}/extensions/libglx.so ]
-	then
-		ln -sf /usr/lib/opengl/${1}/extensions/libglx.so \
-			/etc/opengl/libglx.so
-	fi
-	#setup the /usr/lib/modules/extensions/libglx.a symlink
-	if [ -e /usr/lib/opengl/${1}/extensions/libglx.a ]
-	then
-		ln -sf /usr/lib/opengl/${1}/extensions/libglx.a \
-			/etc/opengl/libglx.a
-	fi
-
-	eend 0
-fi
-
-
-# vim:ts=4
diff --git a/openglify b/openglify
index 22fa9ca..3a1fa12 100755
--- a/openglify
+++ b/openglify
@@ -1,28 +1,22 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/livecd-tools/openglify,v 1.5 2005/03/01 18:13:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/livecd-tools/openglify,v 1.6 2005/05/31 19:08:28 wolf31o2 Exp $
 
-#This script is designed to tweak the system for opengl-update-livecd
+#This script is designed to tweak the system for opengl-update
 #set up our flexible opengl stuff:
 
 #move symlinks to a malleable /etc/opengl directory.
-install -d /etc/opengl
-mv /usr/lib/libGL.* /etc/opengl/
-mv /usr/lib/libGLcore.* /etc/opengl/
-ln -sf /etc/opengl/libGL.so /usr/lib/libGL.so
-ln -sf /etc/opengl/libGL.so.1 /usr/lib/libGL.so.1
-ln -sf /etc/opengl/libGLcore.so /usr/lib/libGLcore.so
-ln -sf /etc/opengl/libGLcore.so.1 /usr/lib/libGLcore.so.1
-mv /usr/lib/libMesaGL.so /etc/opengl/
-ln -sf /etc/opengl/libMesaGL.so /usr/lib/libMesaGL.so
-for x in libglx.a libglx.so
-do
-	if [ -e /usr/lib/modules/extensions/${x} -o -L \
-	/usr/lib/modules/extensions/${x} ] 
-	then
-		mv /usr/lib/modules/extensions/${x} /etc/opengl/
-	fi
-	ln -s /etc/opengl/${x} \
-	/usr/lib/modules/extensions/${x}
-done
+install -d test/lib/modules/extensions
+
+rm /usr/lib/libGL{,core}.{a,so}* > /dev/null 2>&1
+rm /usr/lib/modules/extensions/libglx* > /dev/null 2>&1
+
+ln -sf /etc/opengl/lib/libGL.so /usr/lib/libGL.so
+ln -sf /etc/opengl/lib/libGL.so.1 /usr/lib/libGL.so.1
+ln -sf /etc/opengl/lib/libGLcore.so /usr/lib/libGLcore.so
+ln -sf /etc/opengl/lib/libGLcore.so.1 /usr/lib/libGLcore.so.1
+ln -sf /etc/opengl/lib/modules/extensions/libglx.so \
+	/usr/lib/modules/extensions/libglx.so
+ln -sf /etc/opengl/lib/modules/extensions/libglx.a \
+	/usr/lib/modules/extensions/libglx.a