diff --git a/.travis.yml b/.travis.yml index 479ca3ed..2dc8ff20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ script: - sudo echo "Travis Banch = $TRAVIS_BRANCH" - sudo bash -x bin/install.sh $TRAVIS_BRANCH +- sudo ee stack install - sudo ee system install nginx - sudo ee system install php - sudo ee system install mysql diff --git a/bin/easyengine b/bin/easyengine index c5eaa80a..ff400b75 100644 --- a/bin/easyengine +++ b/bin/easyengine @@ -24,54 +24,90 @@ if [ "$EE_FIRST" = "version" ] || [ "$EE_FIRST" = "--version" ] || [ "$EE_FIRST" then # Display Easy Engine Version echo "EasyEngine (ee) version: $EE_VERSION" + # EasyEngine stack/system elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ] then # EasyEngine install if [ "$EE_SECOND" = "install" ]; then - if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ]; then + if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ] || [ "$EE_THIRD" = "adminer" ] || [ "$EE_THIRD" = "phpmyadmin" ] || [ "$EE_THIRD" = "wpcli" ] || [ "$EE_THIRD" = "utils" ]; then + if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ]; then + # Setup nginx/php repository + ee_mod_repo_$EE_THIRD + + # Fix GnuPG key + ee_lib_gpg_key_fix + fi + + if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ]; then + # Execute: apt-get update + ee_lib_apt_get_update + + # Install nginx/php/mysql/postfix package + ee_mod_install_$EE_THIRD + fi + + if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ]; then + # Setup nginx/php/mysql + ee_mod_setup_$EE_THIRD + fi + + if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ]; then + # Restart php5-fpm + if [ "$EE_THIRD" = "php" ];then + ee_lib_service php5-fpm restart + + # Initialize Git + ee_lib_git_init /etc/php5/ + else + # Restart nginx/mysql/postfix + ee_lib_service $EE_THIRD restart + + # Initialize Git + ee_lib_git_init /etc/$EE_THIRD/ + fi + fi + + if [ "$EE_THIRD" = "adminer" ] || [ "$EE_THIRD" = "phpmyadmin" ] || [ "$EE_THIRD" = "wpcli" ] || [ "$EE_THIRD" = "utils" ];then + # Install adminer/phpmyadmin/wpcli/utils + ee_ven_install_$EE_THIRD + fi + + # Display success message + ee_lib_echo "$EE_THIRD successfully installed" + elif [ "$EE_THIRD" = "" ]; then # Setup nginx/php repository - ee_mod_repo_$EE_THIRD + ee_mod_repo_nginx + ee_mod_repo_php # Fix GnuPG key ee_lib_gpg_key_fix - fi - if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ]; then # Execute: apt-get update ee_lib_apt_get_update # Install nginx/php/mysql/postfix package - ee_mod_install_$EE_THIRD - elif [ "$EE_THIRD" = "adminer" ] || [ "$EE_THIRD" = "phpmyadmin" ] || [ "$EE_THIRD" = "wpcli" ] || [ "$EE_THIRD" = "utils" ];then - # Install phpmyadmin/adminer - ee_ven_install_$EE_THIRD - fi + ee_mod_install_nginx + ee_mod_install_php + ee_mod_install_mysql + ee_mod_install_postfix - if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ]; then # Setup nginx/php/mysql - ee_mod_setup_$EE_THIRD - fi + ee_mod_setup_nginx + ee_mod_setup_php + ee_mod_setup_mysql - if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ]; then - # Restart php5-fpm - if [ "$EE_THIRD" = "php" ];then - ee_lib_service php5-fpm restart - - # Initialize Git - EE_GIT_DIR=/etc/php5/ - ee_lib_git_init - else - # Restart nginx/mysql/postfix - ee_lib_service $EE_THIRD restart + # # Restart nginx/mysql/postfix + ee_lib_service nginx php5-fpm mysql restart - # Initialize Git - EE_GIT_DIR=/etc/$EE_THIRD/ - ee_lib_git_init - fi - fi + # Initialize Git + ee_lib_git_init /etc/nginx/ /etc/php5/ /etc/mysql/ - # Display success message - ee_lib_echo "$EE_THIRD successfully installed" + # Install adminer/phpmyadmin/wpcli/utils + ee_ven_install_adminer + ee_ven_install_phpmyadmin + ee_ven_install_wpcli + ee_ven_install_utils + fi fi fi diff --git a/src/lib/ee_lib_git_init.sh b/src/lib/ee_lib_git_init.sh index c8006011..4a3939fb 100644 --- a/src/lib/ee_lib_git_init.sh +++ b/src/lib/ee_lib_git_init.sh @@ -2,20 +2,22 @@ function ee_lib_git_init() { - # Change directory - cd $EE_GIT_DIR || ee_lib_error "Unable to change directory $EE_GIT_DIR, exit status = " $? + for ee_git_dir in $@; do + # Change directory + cd $ee_git_dir || ee_lib_error "Unable to change directory $ee_git_dir, exit status = " $? - # Check .git - if [ ! -d .git ]; then - ee_lib_echo "Initialize Git On $EE_GIT_DIR..." - git init &>> $EE_COMMAND_LOG \ - || ee_lib_error "Unable to initialize Git on $EE_GIT_DIR, exit status = " $? - fi + # Check .git + if [ ! -d .git ]; then + ee_lib_echo "Initialize Git On ${ee_git_dir}..." + git init &>> $EE_COMMAND_LOG \ + || ee_lib_error "Unable to initialize Git on $ee_git_dir, exit status = " $? + fi - # Check for untracked files - if [ $(git status -s | wc -l) -ne 0 ]; then - # Add files in Git version control - git add --all && git commit -am "Initialize Git On $EE_GIT_DIR" &>> $EE_COMMAND_LOG \ - || ee_lib_error "Unable to Git commit on $EE_GIT_DIR, exit status = " $? - fi + # Check for untracked files + if [ $(git status -s | wc -l) -ne 0 ]; then + # Add files in Git version control + git add --all && git commit -am "Initialize Git On $ee_git_dir" &>> $EE_COMMAND_LOG \ + || ee_lib_error "Unable to Git commit on $ee_git_dir, exit status = " $? + fi + done }