Browse Source

Change --mail,--web,--all to mail,web,all

bugfixes
gau1991 10 years ago
parent
commit
7f62724232
  1. 8
      bin/easyengine
  2. 2
      config/bash_completion.d/ee
  3. 6
      docs/man/ee.8

8
bin/easyengine

@ -90,7 +90,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
# Display success message # Display success message
ee_lib_echo "$EE_THIRD successfully installed" ee_lib_echo "$EE_THIRD successfully installed"
elif [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "--web" ] || [ "$EE_THIRD" = "--all" ]; then elif [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "web" ] || [ "$EE_THIRD" = "all" ]; then
# Setup NGINX/PHP repository # Setup NGINX/PHP repository
ee_mod_repo_nginx ee_mod_repo_nginx
ee_mod_repo_php ee_mod_repo_php
@ -130,7 +130,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
ee_lib_echo_info "ee site create example.com --wp" ee_lib_echo_info "ee site create example.com --wp"
fi fi
# EasyEngine mail server setup # EasyEngine mail server setup
if [ "$EE_THIRD" = "--mail" ] || [ "$EE_THIRD" = "--all" ];then if [ "$EE_THIRD" = "mail" ] || [ "$EE_THIRD" = "all" ];then
# Check required Packages are installed or not # Check required Packages are installed or not
dpkg --get-selections | grep -v deinstall | grep nginx > /dev/null \ dpkg --get-selections | grep -v deinstall | grep nginx > /dev/null \
@ -210,7 +210,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
elif [ "$EE_SECOND" = "purge" ];then elif [ "$EE_SECOND" = "purge" ];then
ee_lib_echo "$EE_THIRD successfully purged" ee_lib_echo "$EE_THIRD successfully purged"
fi fi
elif [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "--web" ] || [ "$EE_THIRD" = "--all" ]; then elif [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "web" ] || [ "$EE_THIRD" = "all" ]; then
# Remove/Purge NGINX/PHP/MySQL/Postfix package # Remove/Purge NGINX/PHP/MySQL/Postfix package
ee_mod_remove_nginx ee_mod_remove_nginx
ee_mod_remove_php ee_mod_remove_php
@ -233,7 +233,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
ee_lib_echo "Successfully purged web packages" ee_lib_echo "Successfully purged web packages"
fi fi
fi fi
if [ "$EE_THIRD" = "--all" ] || [ "$EE_THIRD" = "--mail" ];then if [ "$EE_THIRD" = "all" ] || [ "$EE_THIRD" = "mail" ];then
# Remove Dovecot # Remove Dovecot
ee_mod_remove_dovecot ee_mod_remove_dovecot

2
config/bash_completion.d/ee

@ -25,7 +25,7 @@ function EE_AUTO()
;; ;;
install|remove|purge) install|remove|purge)
COMPREPLY=( $( compgen -W '$(echo --mail --all --web; cd /usr/local/lib/easyengine/modules/stack/install; find -maxdepth 1 -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null; cd /usr/local/lib/easyengine/vendor/; find -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null | egrep -v "roundcube|vimbadmin" )' -- $CURRENT ) ) COMPREPLY=( $( compgen -W '$(echo mail all web; cd /usr/local/lib/easyengine/modules/stack/install; find -maxdepth 1 -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null; cd /usr/local/lib/easyengine/vendor/; find -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null | egrep -v "roundcube|vimbadmin" )' -- $CURRENT ) )
return 0 return 0
;; ;;

6
docs/man/ee.8

@ -44,19 +44,19 @@ Display easyengine (ee) help.
.TP .TP
.B stack .B stack
.TP .TP
.B install [ --all | --web | --mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ] .B install [ all | web | mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
.br .br
Install Nginx PHP5 MySQL Postfix stack Packages if not used with Install Nginx PHP5 MySQL Postfix stack Packages if not used with
.br .br
any options.Installs specific package if used with option. any options.Installs specific package if used with option.
.TP .TP
.B remove [ --all | --web | --mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ] .B remove [ all | web | mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
.br .br
Remove Nginx PHP5 MySQL Postfix stack Packages if not used with Remove Nginx PHP5 MySQL Postfix stack Packages if not used with
.br .br
any options. Remove specific package if used with option. any options. Remove specific package if used with option.
.TP .TP
.B purge [ --all | --web | --mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ] .B purge [ all | web | mail | nginx | php | mysql | postfix | adminer | phpmyadmin | wpcli | utils ]
.br .br
Purge Nginx PHP5 MySQL Postfix stack Packages if not used with any Purge Nginx PHP5 MySQL Postfix stack Packages if not used with any
.br .br

Loading…
Cancel
Save