Merge pull request #6 from acuparse/dev

Version to 1.2.3

CHANGELOG.md

@@ -8,9 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.2.3] - 2018-01-01
+### Fixed
+- Newlines and PHP.
+- Restart DB after creation.
+
 ## [1.2.2] - 2018-08-08
 ### Added
-- Check timezone before installing
+- Check timezone before installing.
 
 ## [1.2.1] - 2018-07-21
 ### Changed

install.sh

@@ -201,7 +201,7 @@ if [ "$OS" = "debian" ] || [ "$OS" = "ubuntu" ] || [ "$OS" = "raspbian" ]; then
 	printf "${YELLOW_TEXT}Creating Acuparse database${PLAIN_TEXT}\n"
 	sleep 1
 	mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e "DELETE FROM mysql.user WHERE User='';DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');DROP DATABASE IF EXISTS test;DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';FLUSH PRIVILEGES;" > /dev/null 2>&1
-	mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e "CREATE DATABASE acuparse; GRANT ALL PRIVILEGES ON acuparse.* TO acuparse@localhost IDENTIFIED BY '$ACUPARSE_DATABASE_PASSWORD'; GRANT SUPER, EVENT ON *.* TO acuparse@localhost" > /dev/null 2>&1
+	mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e "CREATE DATABASE acuparse; GRANT ALL PRIVILEGES ON acuparse.* TO acuparse@localhost IDENTIFIED BY '$ACUPARSE_DATABASE_PASSWORD'; GRANT SUPER, EVENT ON *.* TO acuparse@localhost; FLUSH PRIVILEGES;" > /dev/null 2>&1
 
 	# Crontab Config
 	printf "${YELLOW_TEXT}Installing Cron${PLAIN_TEXT}\n"
@@ -213,6 +213,7 @@ if [ "$OS" = "debian" ] || [ "$OS" = "ubuntu" ] || [ "$OS" = "raspbian" ]; then
 	apt-get autoremove -y
 	apt-get clean -y
 	apt-get purge -y
+	systemctl restart mysql.service
 	systemctl restart apache2.service
 
 	# Install Complete

resources/php7.2.sh

@@ -33,24 +33,24 @@ fi
 
 printf "Upgrading PHP to 7.2\n\n"
 
-printf "Installation Ready!\n\nThis process will attempt to remove PHP 5, 7.0, and 7.1 then install PHP 7.2./nThis is your last chance to exit./n/n"
+printf "Installation Ready!\n\nThis process will attempt to remove PHP 5, 7.0, and 7.1 then install PHP 7.2.\nThis is your last chance to exit.\n\n"
 
 printf "When ready, Press [ENTER] to continue\n"
 read READY
 
 printf "Removing PHP 5\n\n"
 sleep 1
-apt-get remove php5 libapache2-mod-php5 php5-mysql php5-gd php5-curl php5-json php5-cli php5-common -y
+apt-get remove php5* -y
 a2dismod php5
 
 printf "Removing PHP 7.0\n\n"
 sleep 1
-apt-get remove php7.0 libapache2-mod-php7.0 php7.0-mysql php7.0-gd php7.0-curl php7.0-json php7.0-cli php7.0-common -y
+apt-get remove php7.0* -y
 a2dismod php7.0
 
 printf "Removing PHP 7.1\n\n"
 sleep 1
-apt-get remove php7.1 libapache2-mod-php7.1 php7.1-mysql php7.1-gd php7.1-curl php7.1-json php7.1-cli php7.1-common -y
+apt-get remove php7.1* -y
 a2dismod php7.1
 
 printf "\nInstalling PHP 7.2\n\n"