From 70402c7f257f91c45f6f73bf896f784a6c1c5bbb Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 6 Feb 2019 03:01:17 +0100
Subject: [PATCH] install_mysql.sh: Create environment file for systemd service
 'EnvironmentFile'.

---
 install_mysql.sh | 71 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/install_mysql.sh b/install_mysql.sh
index 0d7c386..76d53a1 100755
--- a/install_mysql.sh
+++ b/install_mysql.sh
@@ -4839,55 +4839,56 @@ if $INSTALL_SYSTEMD_SERVICE ; then
       error "Setting open_files_limit (LimitNOFILE) to $(ulimit -Hn) failed!"
    fi
 
-   if $PARALLEL_INSTALLATION ; then
+   SYSTEMD_ENV_FILE="/etc/systemd/system/${MYSQL_DISTRIBUTION,,}-${MYSQL_VERSION}.env"
 
-      SYSTEMD_ENV_FILE="/etc/systemd/system/${MYSQL_DISTRIBUTION,,}-${MYSQL_VERSION}.env"
-
-      echononl "Create environmet file fo systemd service.."
-      echo "" >> ${logdir}/main.log
-      echo "## - Create environmet file fo systemd service.." >> ${logdir}/main.log
-      echo "## -" >> ${logdir}/main.log
-      echo "cat <<EOF > $SYSTEMD_ENV_FILE
+   echononl "Create environmet file fo systemd service.."
+   echo "" >> ${logdir}/main.log
+   echo "## - Create environmet file fo systemd service.." >> ${logdir}/main.log
+   echo "## -" >> ${logdir}/main.log
+   echo "cat <<EOF > $SYSTEMD_ENV_FILE
 MYSQL_HOME=\"$MYSQL_INSTALL_DIR\"
 EOF
 " >> ${logdir}/main.log
-      if [[ $? -eq 0 ]] ; then
-         echo_ok
-      else
-         echo_failed
-         error "Creating environmet file fo systemd service failed!"
-      fi
-      cat <<EOF > $SYSTEMD_ENV_FILE
+   if [[ $? -eq 0 ]] ; then
+      echo_ok
+   else
+      echo_failed
+      error "Creating environmet file fo systemd service failed!"
+   fi
+   cat <<EOF > $SYSTEMD_ENV_FILE
 MYSQL_HOME="$MYSQL_INSTALL_DIR"
 EOF
 
-      echononl "Add/Replace 'EnvironmentFile' variable at service file .."
-      echo "" >> ${logdir}/main.log
-      echo "## - Add/Replace 'EnvironmentFile' variable at service file .." >> ${logdir}/main.log
-      echo "## -" >> ${logdir}/main.log
+   echononl "Add/Replace 'EnvironmentFile' variable at service file .."
+   echo "" >> ${logdir}/main.log
+   echo "## - Add/Replace 'EnvironmentFile' variable at service file .." >> ${logdir}/main.log
+   echo "## -" >> ${logdir}/main.log
 
-      if grep -q -E "^\s*EnvironmentFile\s*=" /etc/systemd/system/$MYSQL_SERVICE_FILE ; then
-         echo "perl -i -n -p -e \"s#^(\s*EnvironmentFile\s*=.*)#\#\1\nEnvironmentFile=-${SYSTEMD_ENV_FILE}#\" /etc/systemd/system/$MYSQL_SERVICE_FILE" >> ${logdir}/main.log
-         perl -i -n -p -e "s#^(\s*EnvironmentFile\s*=.*)#\#\1\nEnvironmentFile=-${SYSTEMD_ENV_FILE}#" \
-            /etc/systemd/system/$MYSQL_SERVICE_FILE >> ${logdir}/main.log 2>&1
-         _retval=$?
-      else
-         echo "cat <<EOF >> /etc/systemd/system/$MYSQL_SERVICE_FILE
+   if grep -q -E "^\s*EnvironmentFile\s*=" /etc/systemd/system/$MYSQL_SERVICE_FILE ; then
+      echo "perl -i -n -p -e \"s#^(\s*EnvironmentFile\s*=.*)#\#\1\nEnvironmentFile=-${SYSTEMD_ENV_FILE}#\" /etc/systemd/system/$MYSQL_SERVICE_FILE" >> ${logdir}/main.log
+      perl -i -n -p -e "s#^(\s*EnvironmentFile\s*=.*)#\#\1\nEnvironmentFile=-${SYSTEMD_ENV_FILE}#" \
+         /etc/systemd/system/$MYSQL_SERVICE_FILE >> ${logdir}/main.log 2>&1
+      _retval=$?
+   else
+      echo "cat <<EOF >> /etc/systemd/system/$MYSQL_SERVICE_FILE
 
 EnvironmentFile=-$SYSTEMD_ENV_FILE
 EOF" >> ${logdir}/main.log 2>&1
-         cat <<EOF >> /etc/systemd/system/$MYSQL_SERVICE_FILE 2>> ${logdir}/main.log
+      cat <<EOF >> /etc/systemd/system/$MYSQL_SERVICE_FILE 2>> ${logdir}/main.log
 
 EnvironmentFile=-$SYSTEMD_ENV_FILE
 EOF
-         _retval=$?
-      fi
-      if [ "$_retval" = "0" ]; then
-         echo_ok
-      else
-         echo_failed
-         error "Adding/Replacing 'EnvironmentFile' variable at service file failed!"
-      fi
+      _retval=$?
+   fi
+   if [ "$_retval" = "0" ]; then
+      echo_ok
+   else
+      echo_failed
+      error "Adding/Replacing 'EnvironmentFile' variable at service file failed!"
+   fi
+
+   if $PARALLEL_INSTALLATION ; then
+
 
       if grep -q -E "^\s*Alias\s*=" /etc/systemd/system/$MYSQL_SERVICE_FILE ; then
          echononl "Disable 'Alias' directive(s) at service file.."