[patch] php.eselect.canonicalise.patch

php.eselect.canonicalise.diff (text/plain), 3.06 KB, created by Brian Evans (RETIRED) on 2015-12-03 17:21:44 UTC

--- a/php.eselect	2015-12-03 08:50:08.182860685 -0500
+++ b/php.eselect	2015-12-03 12:17:37.404897273 -0500
@@ -83,8 +83,6 @@
 	echo ${ret}
 }
 
-apache2_link="${EROOT}"$(get_active_libdir)/apache2/modules/libphp5$(get_libname)
-
 cleanup() {
 	local target=$(find_targets_$1 | tail -n 1)
 	[[ -z $target ]] && 
@@ -107,6 +105,7 @@
 	for target in $(find_targets); do
 		for libdir in $(get_libdirs); do
 			[[ -f ${EROOT}${libdir}/$target/apache2/libphp5$(get_libname) ]] && echo $target
+			[[ -f ${EROOT}${libdir}/$target/apache2/libphp7$(get_libname) ]] && echo $target
 		done
 	done | sort -u
 }
@@ -139,19 +138,39 @@
 }
 
 get_active_cli() {
-	readlink -e "${EROOT}"/usr/bin/php | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9][0-9]*\)/bin/php:\1:p"
+	local target=$(canonicalise "${EROOT}"/usr/bin/php)
+	if [[ -a "${target}" ]] ; then
+		echo "${target}" | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9][0-9]*\)/bin/php:\1:p"
+	fi
 }
 
 get_active_cgi() {
-	readlink -e "${EROOT}"/usr/bin/php-cgi | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9]\)/bin/php-cgi:\1:p"
+	local target=$(canonicalise "${EROOT}"/usr/bin/php-cgi)
+	if [[ -a "${target}" ]] ; then
+		echo "${target}" | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9][0-9]*\)/bin/php-cgi:\1:p"
+	fi
 }
 
 get_active_fpm() {
-	readlink -e "${EROOT}"/usr/bin/php-fpm | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9]\)/bin/php-fpm:\1:p"
+	local target=$(canonicalise "${EROOT}"/usr/bin/php-fpm)
+	if [[ -a "${target}" ]] ; then
+		echo "${target}" | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9][0-9]*\)/bin/php-fpm:\1:p"
+	fi
 }
 
 get_active_apache2() {
-	readlink -e "${EROOT}"$(get_active_libdir)/apache2/modules/libphp5$(get_libname) | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9]\)/apache2/libphp5$(get_libname):\1:p"
+	local target
+	if [[ -L "${EROOT}"$(get_active_libdir)/apache2/modules/libphp5$(get_libname) ]] ; then
+		target=$(canonicalise "${EROOT}"$(get_active_libdir)/apache2/modules/libphp5$(get_libname))
+		if [[ -a "${target}" ]] ; then
+			echo "${target}" | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9]\)/apache2/libphp5$(get_libname):\1:p"
+		fi
+	elif [[ -L "${EROOT}"$(get_active_libdir)/apache2/modules/libphp7$(get_libname) ]] ; then
+		target=$(canonicalise "${EROOT}"$(get_active_libdir)/apache2/modules/libphp7$(get_libname))
+		if [[ -a "${target}" ]] ; then
+			echo "${target}" | sed -ne "s:.*/usr/.*/\(php[0-9]\.[0-9]\)/apache2/libphp7$(get_libname):\1:p"
+		fi
+	fi
 }
 
 resolv_target() {
@@ -217,8 +236,9 @@
 	local libdir t=$(resolv_target apache2 $1)
 	[[ -z $t ]] && die -q "Bad target"
 	for libdir in $(get_libdirs); do
-		ln -sf ../../$t/apache2/libphp5$(get_libname) "${EROOT}"${libdir}/apache2/modules/ || \
-			die -q "Failed to set symlink for ${EPREFIX}${libdir}/apache2/modules/libphp5$(get_libname)"
+		rm -f "${EROOT}${libdir}"/apache2/modules/libphp{5,7}$(get_libname)
+		ln -sf ../../$t/apache2/libphp${t:3:1}$(get_libname) "${EROOT}"${libdir}/apache2/modules/ || \
+			die -q "Failed to set symlink for ${EPREFIX}${libdir}/apache2/modules/libphp${t:3:1}$(get_libname)"
 	done
 	echo "You have to run \`${EPREFIX}/etc/init.d/apache2 restart' for the changes to take effect"
 }