v 0.144.5

- Cache : fix rewrite on multisite.
- Multisite : detect www

Author: Darklg

bin/cache.sh

@@ -22,7 +22,7 @@ else
     # Loop through each multisite URL
     for _wputools_multisite_url in ${_wputools_multisite_urls}; do
         echo "# Flushing rewrite rules for ${_wputools_multisite_url}";
-        _WPCLICOMMAND --url="${_wputools_multisite_url}" rewrite flush --hard;
+        _WPCLICOMMAND --url="${_wputools_multisite_url}" rewrite flush;
     done
 fi;
 

inc/functions.sh

@@ -365,6 +365,8 @@ function wputools_select_multisite(){
 
     local _wputools_sites=($(wputools_get_multisite_urls));
     local _tmp_home_url="";
+    local _tmp_url_www="";
+    local _tmp_site_www="";
 
     for arg in "$@"; do
 
@@ -373,11 +375,20 @@ function wputools_select_multisite(){
 
             # Clean argument
             _tmp_home_url=$(wputools_format_home_url "${arg#*-url=}");
+            _tmp_url_www=${_tmp_home_url/\/\//\/\/www\.};
             for site in "${_wputools_sites[@]}"; do
+                _tmp_site_www=${site/\/\//\/\/www\.};
 
                 # If the URL matches a website, use it
-                if [[ "$site" == "$_tmp_home_url" || "$site" == "${_tmp_home_url}/" ]]; then
-                    _HOME_URL="$_tmp_home_url"
+                if [[
+                    "${site}" == "${_tmp_home_url}" ||
+                    "${site}" == "${_tmp_home_url}/" ||
+                    "${_tmp_site_www}" == "${_tmp_home_url}" ||
+                    "${site}" == "${_tmp_url_www}" ||
+                    "${_tmp_site_www}" == "${_tmp_home_url}/" ||
+                    "${site}" == "${_tmp_url_www}/"
+                    ]]; then
+                    _HOME_URL="$site"
                     echo "Site URL set to ${_HOME_URL} from argument.";
                     return;
                 fi

wputools.sh

@@ -2,7 +2,7 @@
 
 WPUTools(){
 
-local _WPUTOOLS_VERSION='0.144.4';
+local _WPUTOOLS_VERSION='0.144.5';
 local _PHP_VERSIONS=(7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 9.0)
 local _PHP_VERSIONS_OBSOLETES=(7.0 7.1 7.2 7.3 7.4 8.0)
 local _PHP_VERSIONS_ADVANCED=(8.3 8.4 8.5 9.0)