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

[Michael Orlitzky]

commit:     064b605e2bda578b8480b391484be52b0dd9222d
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 22:29:29 2015 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 22:29:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=064b605e

Clean up error/info messages and quoting in the set_* functions.

 src/php.eselect.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/php.eselect.in b/src/php.eselect.in
index 4de770f..14ba819 100644
--- a/src/php.eselect.in
+++ b/src/php.eselect.in
@@ -289,34 +289,34 @@ set_apache2() {
 			"${EROOT}${libdir}/apache2/modules/" || \
 			die -q "Failed to set symlink for ${EPREFIX}${libdir}/apache2/modules/libphp${t:3:1}.so"
 	done
-	echo "You have to run \`${EPREFIX}/etc/init.d/apache2 restart' for the changes to take effect"
+	echo "Please restart apache for the changes to take effect."
 }
 
 set_cli() {
 	local file libdir t=$(resolv_target cli $1)
-	[[ -z $t ]] && die -q "Bad target"
+	[[ -z $t ]] && die -q "invalid target"
 	for file in php phpize php-config; do
-		@LN_S@ --force ../..$(get_active_libdir)/$t/bin/$file \
-			"${EROOT}"/usr/bin/$file || \
-			die -q "Failed to create symlink for ${file}"
+		@LN_S@ --force "../..$(get_active_libdir)/${t}/bin/${file}" \
+			"${EROOT}/usr/bin/${file}" || \
+			die -q "failed to create active ${file} symlink"
 	done
 }
 
 set_cgi() {
 	t=$(resolv_target cgi $1)
-	[[ -z $t ]] && die -q "Bad target"
-	@LN_S@ --force ../..$(get_active_libdir)/$t/bin/php-cgi \
+	[[ -z $t ]] && die -q "invalid target"
+	@LN_S@ --force "../..$(get_active_libdir)/${t}/bin/php-cgi" \
 		"${EROOT}"/usr/bin/php-cgi || \
-		die -q "Failed to create symlink for php-cgi"
+		die -q "failed to create active php-cgi symlink"
 }
 
 set_fpm() {
 	local t=$(resolv_target fpm $1)
-	[[ -z $t ]] && die -q "Bad target"
-	@LN_S@ --force ../..$(get_active_libdir)/$t/bin/php-fpm \
+	[[ -z $t ]] && die -q "invalid target"
+	@LN_S@ --force "../..$(get_active_libdir)/${t}/bin/php-fpm" \
 		"${EROOT}"/usr/bin/php-fpm || \
-		die -q "Failed to create symlink for the php-fpm binary"
-	echo "You have to run \`${EPREFIX}/etc/init.d/php-fpm restart' for the changes to take effect"
+		die -q "failed to create symlink for the php-fpm binary"
+	echo "Please restart php-fpm for the changes to take effect."
 }
 ## set action