From 5092297a92cdce34c7caaf24724f8b69ac9a3246 Mon Sep 17 00:00:00 2001
From: barremian <machinetime77@gmail.com>
Date: Wed, 29 May 2024 00:13:21 +0200
Subject: [PATCH] lxc-forgejo: Replace concluding msg_info with msg_ok and
 remove unnecessary service restart messages for database setups

---
 install/forgejo-install.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/install/forgejo-install.sh b/install/forgejo-install.sh
index 74490958..fd8bbffc 100644
--- a/install/forgejo-install.sh
+++ b/install/forgejo-install.sh
@@ -38,7 +38,7 @@ chown root:git /etc/forgejo && chmod 770 /etc/forgejo
 echo "" >>~/forgejo.creds
 echo -e "Forgejo GIT User: \e[32mgit\e[0m" >>~/forgejo.creds
 echo -e "Forgejo data directory: \e[32m/var/lib/forgejo\e[0m" >>~/forgejo.creds
-msg_info "Setup Forgejo"
+msg_ok "Setup Forgejo"
 
 msg_info "Setting up database"
 read -r -p "Forgejo uses SQLite by default. Would you like to use another database? <y/N> " prompt
@@ -74,10 +74,8 @@ local   forgejodb       forgejo         scram-sha-256
 host    forgejodb       forgejo         127.0.0.1/32            scram-sha-256  # IPv4 local connections
 host    forgejodb       forgejo         ::1/128                 scram-sha-256  # IPv6 local connections
 EOL
-    msg_info "Restarting PostgreSQL"
     $STD systemctl restart postgresql
-    msg_info "Restarted PostgreSQL"
-    msg_info "Setup PostgreSQL"
+    msg_ok "Setup PostgreSQL"
   fi
   if [ "$DB_CHOICE" == "MySQL" ]; then
     msg_info "Setting up MySQL"
@@ -91,10 +89,8 @@ EOL
     echo -e "Forgejo MySQL Database Password: \e[32m$DB_PASS\e[0m" >>~/forgejo.creds
     echo -e "Forgejo MySQL Database Name: \e[32m$DB_NAME\e[0m" >>~/forgejo.creds
     mysql -uroot -p"$ADMIN_PASS" -e "SET old_passwords=0; GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '$ADMIN_PASS' WITH GRANT OPTION; CREATE USER '$DB_USER' IDENTIFIED BY '$DB_PASS'; CREATE DATABASE $DB_NAME CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'; GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER' IDENTIFIED BY '$DB_PASS'; FLUSH PRIVILEGES;"
-    msg_info "Restarting MySQL"
     $STD systemctl restart mysql
-    msg_info "Restarted MySQL"
-    msg_info "Setup MySQL"
+    msg_ok "Setup MySQL"
   fi
   if [ "$DB_CHOICE" == "MariaDB" ]; then
     msg_info "Setting up MariaDB"
@@ -108,10 +104,8 @@ EOL
     echo -e "Forgejo MariaDB Database Password: \e[32m$DB_PASS\e[0m" >>~/forgejo.creds
     echo -e "Forgejo MariaDB Database Name: \e[32m$DB_NAME\e[0m" >>~/forgejo.creds
     mariadb -uroot -p"$ADMIN_PASS" -e "SET old_passwords=0; GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '$ADMIN_PASS' WITH GRANT OPTION; CREATE USER '$DB_USER' IDENTIFIED BY '$DB_PASS'; CREATE DATABASE $DB_NAME CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'; GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER' IDENTIFIED BY '$DB_PASS'; FLUSH PRIVILEGES;"
-    msg_info "Restarting MariaDB"
     $STD systemctl restart mariadb
-    msg_info "Restarted MariaDB"
-    msg_info "Setup MariaDB"
+    msg_ok "Setup MariaDB"
   fi
 else
   msg_ok "${BL}SQLite${CL} will be used"