lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix plugin delete

next
Mitesh Shah 10 years ago
parent
d0f87f06e8
commit
b7ac09a920
2 changed files with 52 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      bin/easyengine
  2. 25
      src/modules/site/update/ee_mod_update_website.sh

35
bin/easyengine
View File

@ -558,34 +558,59 @@ elif [ "$EE_FIRST" = "site" ]; then
EE_SITE_CURRENT_TYPE="--mysql"
# Single WordPress
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSINGLE BASIC" ]; then
EE_SITE_CURRENT_WP="--wp"
EE_SITE_CURRENT_CACHE="--basic"
EE_SITE_CURRENT_TYPE="--wp --basic"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSINGLE WP SUPER CACHE" ]; then
EE_SITE_CURRENT_WP="--wp"
EE_SITE_CURRENT_CACHE="--wpsc"
EE_SITE_CURRENT_TYPE="--wp --wpsc"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSINGLE W3 TOTAL CACHE" ]; then
EE_SITE_CURRENT_WP="--wp"
EE_SITE_CURRENT_CACHE="--w3tc"
EE_SITE_CURRENT_TYPE="--wp --w3tc"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSINGLE FAST CGI" ]; then
EE_SITE_CURRENT_WP="--wp"
EE_SITE_CURRENT_CACHE="--wpfc"
EE_SITE_CURRENT_TYPE="--wp --wpfc"
# WordPress subdirectory
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDIR BASIC" ]; then
EE_SITE_CURRENT_WP="--wpsubdir"
EE_SITE_CURRENT_CACHE="--basic"
EE_SITE_CURRENT_TYPE="--wpsubdir --basic"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDIR WP SUPER CACHE" ]; then
EE_SITE_CURRENT_WP="--wpsubdir"
EE_SITE_CURRENT_CACHE="--wpsc"
EE_SITE_CURRENT_TYPE="--wpsubdir --wpsc"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDIR W3 TOTAL CACHE" ]; then
EE_SITE_CURRENT_WP="--wpsubdir"
EE_SITE_CURRENT_CACHE="--w3tc"
EE_SITE_CURRENT_TYPE="--wpsubdir --w3tc"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDIR FAST CGI" ]; then
EE_SITE_CURRENT_WP="--wpsubdir"
EE_SITE_CURRENT_CACHE="--wpfc"
EE_SITE_CURRENT_TYPE="--wpsubdir --wpfc"
# WordPress subdomain
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDOMAIN BASIC" ]; then
EE_SITE_CURRENT_WP="--wpsubdomain"
EE_SITE_CURRENT_CACHE="--basic"
EE_SITE_CURRENT_TYPE="--wpsubdomain --basic"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDOMAIN WP SUPER CACHE" ]; then
EE_SITE_CURRENT_WP="--wpsubdomain"
EE_SITE_CURRENT_CACHE="--wpsc"
EE_SITE_CURRENT_TYPE="--wpsubdomain --wpsc"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDOMAIN W3 TOTAL CACHE" ]; then
EE_SITE_CURRENT_WP="--wpsubdomain"
EE_SITE_CURRENT_CACHE="--w3tc"
EE_SITE_CURRENT_TYPE="--wpsubdomain --w3tc"
elif [ "$EE_SITE_CURRENT_TYPE" = "WPSUBDOMAIN FAST CGI" ]; then
EE_SITE_CURRENT_WP="--wpsubdomain"
EE_SITE_CURRENT_CACHE="--wpfc"
EE_SITE_CURRENT_TYPE="--wpsubdomain --wpfc"
fi
# Detect update website type and cache
# Single WordPress
if [ "$EE_SITE_CREATE_OPTION" = "--wp" ]; then
if [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then
EE_SITE_UPDATE_TYPE="--wp --basic"
@ -596,6 +621,7 @@ elif [ "$EE_FIRST" = "site" ]; then
elif [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
EE_SITE_UPDATE_TYPE="--wp --wpfc"
fi
# WordPress subdirectory
elif [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ]; then
if [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then
EE_SITE_UPDATE_TYPE="--wpsubdir --basic"
@ -606,6 +632,7 @@ elif [ "$EE_FIRST" = "site" ]; then
elif [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
EE_SITE_UPDATE_TYPE="--wpsubdir --wpfc"
fi
# WordPress subdomain
elif [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
if [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then
EE_SITE_UPDATE_TYPE="--wpsubdomain --basic"
@ -619,7 +646,7 @@ elif [ "$EE_FIRST" = "site" ]; then
fi
# Let's log site current option
ee_lib_echo_escape "EE_SITE_CURRENT_TYPE = $EE_SITE_CURRENT_TYPE \nEE_SITE_UPDATE_TYPE = $EE_SITE_UPDATE_TYPE" &>> $EE_COMMAND_LOG
ee_lib_echo_escape "EE_SITE_CURRENT_WP = $EE_SITE_CURRENT_WP \nEE_SITE_CURRENT_CACHE = $EE_SITE_CURRENT_CACHE \nEE_SITE_CURRENT_TYPE = $EE_SITE_CURRENT_TYPE \nEE_SITE_UPDATE_TYPE = $EE_SITE_UPDATE_TYPE" &>> $EE_COMMAND_LOG
# Lets update HTML|PHP website
if [[ "$EE_SITE_CURRENT_TYPE" = "--html" && "$EE_SITE_CREATE_OPTION" != "--html" ]] || [[ "$EE_SITE_CURRENT_TYPE" = "--php" && "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" ]]; then
@ -630,17 +657,17 @@ elif [ "$EE_FIRST" = "site" ]; then
# Lets call update function
ee_mod_update_website
elif [[ "$EE_SITE_CURRENT_TYPE" = "--wp --basic" || "$EE_SITE_CURRENT_TYPE" = "--wp --wpsc" || "$EE_SITE_CURRENT_TYPE" = "--wp --w3tc" || "$EE_SITE_CURRENT_TYPE" = "--wp --wpfc" ]] \
elif [[ "$EE_SITE_CURRENT_WP" = "--wp" ]] \
&& [[ "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" && "$EE_SITE_CURRENT_TYPE" != "$EE_SITE_UPDATE_TYPE" ]]; then
# Lets call update function
ee_mod_update_website
elif [[ "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --basic" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --wpsc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --w3tc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --wpfc" ]] \
elif [[ "$EE_SITE_CURRENT_WP" = "--wpsubdir" ]] \
&& [[ "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" && "$EE_SITE_CREATE_OPTION" != "--wp" && "$EE_SITE_CREATE_OPTION" != "--wpsubdomain" && "$EE_SITE_CURRENT_TYPE" != "$EE_SITE_UPDATE_TYPE" ]]; then
# Lets call update function
ee_mod_update_website
elif [[ "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --basic" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --wpsc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --w3tc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --wpfc" ]] \
elif [[ "$EE_SITE_CURRENT_WP" = "--wpsubdomain" ]] \
&& [[ "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" && "$EE_SITE_CREATE_OPTION" != "--wp" && "$EE_SITE_CREATE_OPTION" != "--wpsubdir" && "$EE_SITE_CURRENT_TYPE" != "$EE_SITE_UPDATE_TYPE" ]]; then
# Lets call update function
ee_mod_update_website

25
src/modules/site/update/ee_mod_update_website.sh
View File

@ -28,7 +28,7 @@ function ee_mod_update_website() {
fi
# Setup/Install WordPress for HTML|PHP|MySQL websites
if [[ "$EE_SITE_CURRENT_TYPE" != "--wp --basic" && "$EE_SITE_CURRENT_TYPE" != "--wp --wpsc" && "$EE_SITE_CURRENT_TYPE" != "--wp --w3tc" && "$EE_SITE_CURRENT_TYPE" != "--wp --wpfc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --basic" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --wpsc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --w3tc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --wpfc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --basic" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --wpsc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --w3tc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --wpfc" ]] &&
if [[ "$EE_SITE_CURRENT_TYPE" = "--html" || "$EE_SITE_CURRENT_TYPE" = "--php" || "$EE_SITE_CURRENT_TYPE" = "--mysql" ]] &&
[[ "$EE_SITE_CREATE_OPTION" = "--wp" || "$EE_SITE_CREATE_OPTION" = "--wpsubdir" || "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]]; then
# Setup WordPress
ee_mod_setup_wordpress
@ -43,16 +43,33 @@ function ee_mod_update_website() {
ee_mod_plugin_settings
# Update WordPress Websites
elif [[ "$EE_SITE_CURRENT_TYPE" = "--wp --basic" || "$EE_SITE_CURRENT_TYPE" = "--wp --wpsc" || "$EE_SITE_CURRENT_TYPE" = "--wp --w3tc" || "$EE_SITE_CURRENT_TYPE" = "--wp --wpfc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --basic" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --wpsc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --w3tc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdir --wpfc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --basic" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --wpsc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --w3tc" || "$EE_SITE_CURRENT_TYPE" = "--wpsubdomain --wpfc" ]]; then
elif [[ "$EE_SITE_CURRENT_WP" = "--wp" || "$EE_SITE_CURRENT_WP" = "--wpsubdir" || "$EE_SITE_CURRENT_WP" = "--wpsubdomain" ]]; then
# Setup WordPress Network for --wp websites
if [[ "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --basic" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --wpsc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --w3tc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdir --wpfc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --basic" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --wpsc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --w3tc" && "$EE_SITE_CURRENT_TYPE" != "--wpsubdomain --wpfc" ]]; then
if [[ "$EE_SITE_CURRENT_WP" = "--wp" ]]; then
if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
ee_mod_setup_network
fi
fi
# Uninstall unwanted plugins
# Current site type: --wp --wpsc
# Update site type: --wpsubdomain --wpsc
# Only delete plugin when current cache is --wpsc and update cache is not --wpsc
if [[ "$EE_SITE_CURRENT_CACHE" = "--wpsc" && "$EE_SITE_CACHE_OPTION" != "--wpsc" ]]; then
ee_lib_echo "Unistalling WP Super Cache plugin, please wait..."
wp plugin --allow-root uninstall wp-super-cache &>> $EE_COMMAND_LOG
fi
# Delete plugin when current cache is --w3tc|--wpfc and update cache is not --w3tc|--wpfc
if [[ "$EE_SITE_CURRENT_CACHE" = "--w3tc" || "$EE_SITE_CURRENT_CACHE" = "--wpfc" ]] && [[ "$EE_SITE_CACHE_OPTION" != "--w3tc" && "$EE_SITE_CACHE_OPTION" != "--wpfc" ]]; then
ee_lib_echo "Uninstalling W3 Total Cache plugin, please wait..."
wp plugin --allow-root uninstall w3-total-cache &>> $EE_COMMAND_LOG
fi
# Install WordPress plugins
ee_mod_plugin_nginx_helper
# As nginx-helper is installed all type of WordPress
# We don't need to install it again
#ee_mod_plugin_nginx_helper
if [ "$EE_SITE_CACHE_OPTION" = "--wpsc" ]; then
ee_mod_plugin_wpsc

Write Preview
Loading…
Cancel
Save