From b6e43599658fafd332aed00d0c6835a6dde21ea3 Mon Sep 17 00:00:00 2001
From: Martin Winkler <efelon@winklerfamilie.eu>
Date: Sat, 22 Jan 2022 00:27:43 +0100
Subject: [PATCH] Cosmetic changes

---
 seqs/gitea.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/seqs/gitea.sh b/seqs/gitea.sh
index 1d5dcfc..008e2d0 100755
--- a/seqs/gitea.sh
+++ b/seqs/gitea.sh
@@ -11,6 +11,8 @@ giteaDir="/usr/local/bin"
 giteaLoc="${giteaDir}/gitea"
 giteaService="https://raw.githubusercontent.com/go-gitea/gitea/master/contrib/systemd/gitea.service"
 giteaServiceLoc="/etc/systemd/system/gitea.service"
+giteaConfigDir="/etc/gitea"
+giteaIniLoc="${giteaConfigDir}/app.ini"
 
 step_config() {
   if [ -z $giteaVersion ] ; then
@@ -89,12 +91,11 @@ step_6() {
 step_7_info() { echo "Show configuration notes"; }
 step_7_alias() { ALIAS="notes"; }
 step_7() {
-  echo -e "Final configuration notes for app.ini:\n\n"
-  echo "$CONFIG_NOTES"
-}
+  outColor green
+  cat <<NOTES_END
+Final configuration notes for $giteaIniLoc:
 
-CONFIG_NOTES="\
-  [repository]
+[repository]
 DEFAULT_CLOSE_ISSUES_VIA_COMMITS_IN_ANY_BRANCH = true
 
 [server]
@@ -111,7 +112,9 @@ NO_REPLY_ADDRESS = yourdomain.com
 
 [attachment]
 # Allow more archives to be uploaded
-ALLOWED_TYPES=application/zip|application/gzip|application/x-zip|application/x-gzip|application/x-shellscript|text/markdown"
+ALLOWED_TYPES=application/zip|application/gzip|application/x-zip|application/x-gzip|application/x-shellscript|text/markdown
+NOTES_END
+}
 
 step_10_info() { echo "Create mysql database for $toolName"; }
 step_10() {
@@ -152,8 +155,8 @@ giteaDownLoc="/tmp/giteaDown"
 
 step_20_info() { echo "Secure settings after installation"; }
 step_20() {
-  exe chmod 750 /etc/gitea
-  exe chmod 644 /etc/gitea/app.ini
+  exe chmod 750 "$giteaConfigDir"
+  exe chmod 644 "$giteaIniLoc"
 }
 
 # Sequence Revision