Skip to content

Commit

Permalink
final testing
Browse files Browse the repository at this point in the history
before release
  • Loading branch information
QROkes committed Jan 18, 2020
1 parent 04b11c0 commit 898f7d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions plugins/log
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,14 @@ elif [[ -n $mysql || -n $syslog ]]; then
isgrl=$( grep -P "^general_log[\t =]" /etc/mysql/my.cnf | cut -f 2 -d "=" -s | sed 's/[^0-9]*//g' )
if [[ -n $enable && $isgrl != 1 ]]; then
sudo sed -i -E "/^[#]?general_log[\[ \t=]/c general_log = 1" /etc/mysql/my.cnf
sudo sed -i -E "/^[#]?general_log_file[\[ \t=]/c general_log_file = /var/log/mysql/mysql.log" /etc/mysql/my.cnf
sudo service mysql restart
echo "${gre}MariaDB General log was successfully enabled!${end}"
elif [[ -n $enable && $isgrl == 1 ]]; then
echo "${gre}MariaDB General log is already enabled!${end}"
elif [[ -n $disable && $isgrl != 0 ]]; then
sudo sed -i -E "/^[#]?general_log[\[ \t=]/c general_log = 0" /etc/mysql/my.cnf
sudo sed -i -E "/^[#]?general_log_file[\[ \t=]/c #general_log_file = /var/log/mysql/mysql.log" /etc/mysql/my.cnf
sudo service mysql restart
echo "${gre}MariaDB General log was successfully disabled!${end}"
elif [[ -n $disable && $isgrl == 0 ]]; then
Expand Down
6 changes: 3 additions & 3 deletions weby
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fi

# Prevent "compulsive" re-installation if you currently have the latest version installed.
checkver=$(wget --timeout=10 -t 1 -qO- https://api.webinoly.com/check?text=true)
if [[ -a /opt/webinoly/webinoly.conf && $2 != "-ver=beta" && $2 != "-ver=alpha" ]]; then
if [[ -f /opt/webinoly/webinoly.conf && $2 != "-ver=beta" && $2 != "-ver=alpha" ]]; then
currentver=$(grep -w "^app-version:.*" /opt/webinoly/webinoly.conf | cut -f 2 -d ':')
if [[ -n $checkver && -n $currentver && ${checkver//.} -le ${currentver//.} ]]; then
echo "$(tput setaf 2)You currently have the latest version!$(tput sgr0)"
Expand Down Expand Up @@ -111,7 +111,7 @@ sudo mv /opt/webinoly/plugins/* /usr/bin/
source /opt/webinoly/lib/general

# Check for uninstalled Webinoly conf file
if [[ -a $HOME/.webinoly-conf-restore_dont-remove ]]; then
if [[ -f $HOME/.webinoly-conf-restore_dont-remove ]]; then
echo "${gre}Seems like Webinoly was installed previously, we will try to recover your old configuration!${end}"
sudo tar -Pxf $HOME/.webinoly-conf-restore_dont-remove -C /
sudo rm -rf $HOME/.webinoly-conf-restore_dont-remove
Expand All @@ -124,7 +124,7 @@ if [[ -a $HOME/.webinoly-conf-restore_dont-remove ]]; then
fi

# Check for Server Conf Updates and Save Tools Port after library is available.
if [[ -a /opt/webinoly/webinoly.conf ]]; then
if [[ -f /opt/webinoly/webinoly.conf ]]; then
echo "${gre}Webinoly Configuration file was found, so we will use it!${end}"
oldapp=$(conf_read app-version)
oldver=$(conf_read server-version)
Expand Down

0 comments on commit 898f7d5

Please sign in to comment.