From 1998a981c172c1d8f7aba3012d66354794d23a47 Mon Sep 17 00:00:00 2001
From: Bruno 21 <bruno@clicclac.info>
Date: Thu, 19 Dec 2019 15:45:41 +0100
Subject: [PATCH] apacheTools

-php 7.4 support
-update sphp
---
 apache_tools.sh | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/apache_tools.sh b/apache_tools.sh
index a059dff..380665e 100755
--- a/apache_tools.sh
+++ b/apache_tools.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
-version=7.2
-echo -e "\033[1mApache Tools: \033[0m"
-
+#version=7.2
 editeur=/usr/local/bin/bbedit
 
+echo -e "\033[1mApache Tools: \033[0m"
+
+# apache
 v_apa=$(httpd -V | grep 'SERVER_CONFIG_FILE')
 conf_apa=$(echo "$v_apa" | awk -F "\"" '{print $2}')
 log_apa=$(grep -e '^ErrorLog' "$conf_apa"  | awk -F "\"" '{print $2}')
@@ -12,9 +13,32 @@ access_apa=$(grep -e 'CustomLog' "$conf_apa" | grep -v "#"  | awk -F "\"" '{prin
 vhost=$(grep -e 'httpd-vhosts.conf' "$conf_apa" | awk '{print $2}')
 ssl=$(grep -e 'httpd-ssl.conf' "$conf_apa" | awk '{print $2}')
 
-v_php=$(php --info | grep -E 'usr.*ini')
-conf_php=$(echo "$v_php" | grep 'Loaded Configuration File' | awk '{print $NF}')
+# PHP
+v_php=$(php --ini | grep -E 'usr.*ini')
+php_ini=$(php --ini)
 
+<<COMMENT
+Loaded Configuration File:         /usr/local/etc/php/7.2/php.ini
+Additional .ini files parsed:      /usr/local/etc/php/7.2/conf.d/ext-apcu.ini,
+/usr/local/etc/php/7.2/conf.d/ext-opcache.ini,
+/usr/local/etc/php/7.2/conf.d/ext-xdebug.ini,
+/usr/local/etc/php/7.2/conf.d/ext-yaml.ini
+COMMENT
+
+conf_php=$(echo "$php_ini" | grep 'Loaded Configuration File' | awk '{print $NF}')
+echo "php.ini: $conf_php"
+
+addconf_dir="`dirname $conf_php`/conf.d/"
+
+addconf_php=$(echo "$php_ini" | grep 'Scan for additional .ini files in' | awk '{print $NF}' | xargs ls)
+echo "Additionnal *.ini:"
+for i in $addconf_php
+do 
+	echo "$addconf_dir$i"
+done
+echo ""
+
+# MySQL
 v_mysql=$(mysql --help | grep -A1 'Default options')
 
 options=(
@@ -27,7 +51,8 @@ options=(
     "Edit (P)HP.ini"
     "Apache/PHP/MySQL (V)ersion"
     "Apache/PHP/MySQL (C)onfiguration files"
-    "Switch to PHP version"
+    "S(w)itch to PHP version"
+    "(U)pdate sphp"
     "(Q)uit" 
 )
 
@@ -43,9 +68,10 @@ select option in "${options[@]}"; do
         7|p|P) "$editeur" "$conf_php" ;;					# php.ini		
         8|v|V) apachectl -v && echo ' ' && php -v && echo ' ' && mysql --version ;;
         9|c|C) echo -e "\033[4mApache:\033[0m " && echo $v_apa && echo ' ' && echo -e "\033[4mPHP:\033[0m " && echo $v_php  && echo ' ' && echo -e "\033[4mMySQL:\033[0m " && echo $v_mysql ;;
-        10) read -e -n 3 -p "Which PHP version? (7.2/7.3)" choice
-        	if [[ "$choice" == "7.2" ]] || [[ "$choice" == "7.3" ]]; then echo "$choice" | xargs -p -n 1 sphp ; fi ;;
-        11|q|Q) break ;;
+        10|w|W) read -e -n 3 -p "Which PHP version? (7.2/7.3/7.4): " choice
+        	if [[ "$choice" == "7.2" ]] || [[ "$choice" == "7.3" ]] || [[ "$choice" == "7.4" ]]; then echo "$choice" | xargs -p -n 1 sphp ; fi ;;
+        11|u|U) curl -L 'https://gist.githubusercontent.com/rhukster/f4c04f1bf59e0b74e335ee5d186a98e2/raw' > /usr/local/bin/sphp && chmod +x /usr/local/bin/sphp ;;
+        12|q|Q) break ;;
     esac
 done