[gentoo-commits] proj/php:master commit in: eselect-php/

["Ole Markus With" <olemarkus@olemarkus.org>]

commit:     38bb6c8942d72ec52dc1a44ff25174dc41358a65
Author:     Ole Markus With <olemarkus <AT> olemarkus <DOT> org>
AuthorDate: Mon Feb  7 12:27:46 2011 +0000
Commit:     Ole Markus With <olemarkus <AT> olemarkus <DOT> org>
CommitDate: Mon Feb  7 12:33:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/php.git;a=commit;h=38bb6c89

Fixed another libdir issue in php.eselect

---
 eselect-php/php.eselect |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eselect-php/php.eselect b/eselect-php/php.eselect
index 0593a85..c410954 100644
--- a/eselect-php/php.eselect
+++ b/eselect-php/php.eselect
@@ -10,11 +10,12 @@ MODULES="cli apache2 fpm cgi"
 get_libdir() {
 	local dir
 	for dir in $(list_libdirs); do
-        ls /usr/${dir}/php*.* 2>&1 > /dev/null
-        if [[ $? -eq 0 ]] ; then
-    		echo /usr/$dir
-    		return
-        fi
+		[[ -L /usr/${dir} ]] && continue
+		ls /usr/${dir}/php*.* > /dev/null 2>&1
+		if [[ $? -eq 0 ]] ; then
+			echo /usr/$dir
+			return
+		fi
 	done
 	echo /usr/lib
 }
@@ -77,14 +78,13 @@ resolv_target() {
 }
 
 check_module() {
-	
 	has $1 $(echo $MODULES) || die -q "Please chose one of the following modules: ${MODULES}"
 }
 
 ## Actual actions
 
 list_apache2() {
-  local targets
+	local targets
 	local a
 	targets=( $(find_targets_apache2) )
 	a=$(get_active_apache2)
@@ -131,7 +131,7 @@ set_apache2() {
 	local t=$(resolv_target apache2 $1)
 	[[ -z $t ]] && die -q "Bad target"
 	ln -sf $(get_libdir)/$t/apache2/libphp5.so $(get_libdir)/apache2/modules/ || \
-	  die -q "Failed to set symlink for libphp5.so"
+		die -q "Failed to set symlink for libphp5.so"
 	echo "You have to run \`/etc/init.d/apache2 restart' for the changes to take effect"
 }
 
@@ -141,7 +141,7 @@ set_cli() {
 	local file
 	for file in php phpize php-config; do
 		ln -sf $(get_libdir)/$t/bin/$file /usr/bin/$file || \
-		  die -q "Failed to create symlink for ${file}"
+			die -q "Failed to create symlink for ${file}"
 	done
 }
 
@@ -157,7 +157,7 @@ set_fpm() {
 	local t=$(resolv_target fpm $1)
 	[[ -z $t ]] && die -q "Bad target"
 	ln -sf $(get_libdir)/$t/bin/php-fpm /usr/bin/php-fpm || \
-	  die -q "Failed to create symlink for the php-fpm binary"
+		die -q "Failed to create symlink for the php-fpm binary"
 	echo "You have to run \`/etc/init.d/php-fpm restart' for the changes to take effect"
 }
 ## set action