diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d1da726f..d0233fb2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,9 @@ +v 1.3.8 - May 26, 2014 + - Fixed phpMyAdmin download issue #251 + - Fixed swap issue #223 by @Swingline0 + - Delete website without prompt by @edwinvandeven #239 + + v 1.3.7 - Apr 29, 2014 - Fixed EasyEngine Update Problem - Fixed Issue #206 diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine index 7b1a4f2b..56646d2f 100644 --- a/usr/local/sbin/easyengine +++ b/usr/local/sbin/easyengine @@ -528,7 +528,7 @@ INSTALLPMA() mkdir -p /var/www/22222/htdocs/db/pma/ || OwnError "Unable To Create phpMyAdmin Directory: /var/www/22222/htdocs/db/pma/" # Download PMA/phpMyAdmin - wget --no-check-certificate -cqO /var/www/22222/htdocs/db/pma/pma.tar.gz http://dl.cihar.com/phpMyAdmin/master/phpMyAdmin-master-latest.tar.gz \ + wget --no-check-certificate -cqO /var/www/22222/htdocs/db/pma/pma.tar.gz https://github.com/phpmyadmin/phpmyadmin/archive/STABLE.tar.gz \ || OwnError "Unable To Download phpMyAdmin" # Extract PMA/phpMyAdmin @@ -1525,7 +1525,14 @@ REMOVEDB() # Remove Database # For Proper read Command Output stty echo - read -p "Are You Sure To Drop $WPDBNAME Database (y/n): " ANSWER + if [ "$1" = "no-prompt" ] + then + # Assume yes + ANSWER="y" + else + # Ask user for confirmation + read -p "Are You Sure To Drop $WPDBNAME Database (y/n): " ANSWER + fi if [ "$ANSWER" = "y" ] then @@ -1556,7 +1563,14 @@ REMOVEFILES() # Remove Webroot # For Proper read Command Output stty echo - read -p "Are You Sure To Remove $DOMAIN Webroot (y/n): " ANSWER + if [ "$1" = "no-prompt" ] + then + # Assume yes + ANSWER="y" + else + # Ask user for confirmation + read -p "Are You Sure To Remove $DOMAIN Webroot (y/n): " ANSWER + fi if [ "$ANSWER" = "y" ] then @@ -1573,8 +1587,14 @@ REMOVENGINXCONF() # Remove Nginx Configuration # For Proper read Command Output stty echo - read -p "Are You Sure To Remove $DOMAIN Nginx Configuration (y/n): " ANSWER - + if [ "$1" = "no-prompt" ] + then + # Assume yes + ANSWER="y" + else + # Ask user for confirmation + read -p "Are You Sure To Remove $DOMAIN Nginx Configuration (y/n): " ANSWER + fi if [ "$ANSWER" = "y" ] then # Remove Webroot @@ -1962,7 +1982,7 @@ if [ "$1" = "version" ] || [ "$1" = "--version" ] || [ "$1" = "-v" ] then # Display Easy Engine Version - echo "easyengine version: 1.3.7" + echo "easyengine version: 1.3.8" # Easy Engine Info elif [ "$1" = "info" ] @@ -2987,6 +3007,24 @@ then # Reload Nginx NGINXRELOAD + # Take Nginx Configuration In Git Version Control + EEGITDIR=/etc/nginx + EEGITMESSAGE="Delete Website With $SITEDELETEARG Option: $DOMAIN" + EEGITCOMMIT + + elif [ "$SITEDELETEARG" = "--all-no-prompt" ] + then + + # Remove All Database And Webroot + REMOVEDB "no-prompt" + REMOVEFILES "no-prompt" + + # Remove Nginx Configuration + REMOVENGINXCONF "no-prompt" + + # Reload Nginx + NGINXRELOAD + # Take Nginx Configuration In Git Version Control EEGITDIR=/etc/nginx EEGITMESSAGE="Delete Website With $SITEDELETEARG Option: $DOMAIN" diff --git a/usr/local/sbin/eeupdate b/usr/local/sbin/eeupdate index 80c6ace7..6f069222 100644 --- a/usr/local/sbin/eeupdate +++ b/usr/local/sbin/eeupdate @@ -625,7 +625,7 @@ then EECURRENTVERSION="1.3.4" fi - if [[ $EECURRENTVERSION = 1.3.4 ]] || [[ $EECURRENTVERSION = 1.3.5 ]] || [[ $EECURRENTVERSION = 1.3.6 ]] + if [[ $EECURRENTVERSION = 1.3.4 ]] || [[ $EECURRENTVERSION = 1.3.5 ]] || [[ $EECURRENTVERSION = 1.3.6 ]] || [[ $EECURRENTVERSION = 1.3.7 ]] then EE134 fi