From a60cdce83e513b2a1e157f1a657768d8506789c8 Mon Sep 17 00:00:00 2001
From: Cyrille L <echolib@a-lec.org>
Date: Thu, 21 Jul 2022 15:49:01 +0200
Subject: [PATCH] Fix: domain creator (local install + statoolinfos)

---
 help/Comment-écrire-en-STL.md             |  2 +-
 var/lib/stl/help/Comment-écrire-en-STL.md |  2 +-
 var/lib/stl/scripts/manage__HTML          |  2 ++
 var/lib/stl/scripts/manage__domain        | 32 +++++++++++++++--------
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/help/Comment-écrire-en-STL.md b/help/Comment-écrire-en-STL.md
index cf7cf1c..8ad7d8e 100644
--- a/help/Comment-écrire-en-STL.md
+++ b/help/Comment-écrire-en-STL.md
@@ -361,7 +361,7 @@ Dans l'article :
 # Chaque item <li> utilise la classe : xxx_li xxx_li-X
 # où X est le nombre de marquurs
 
-# La sortie de cette liste en HTML, avec le valeur CSS choisie "a-lec" :
+# La sortie de cette liste en HTML, avec le préfix CSS choisi "a-lec" :
 
 <ul class="a-lec_list a-lec_list-ul couverture couverture-ul">
   <li class="a-lec_li a-lec_li-1">Livre 1</li>
diff --git a/var/lib/stl/help/Comment-écrire-en-STL.md b/var/lib/stl/help/Comment-écrire-en-STL.md
index cf7cf1c..8ad7d8e 100644
--- a/var/lib/stl/help/Comment-écrire-en-STL.md
+++ b/var/lib/stl/help/Comment-écrire-en-STL.md
@@ -361,7 +361,7 @@ Dans l'article :
 # Chaque item <li> utilise la classe : xxx_li xxx_li-X
 # où X est le nombre de marquurs
 
-# La sortie de cette liste en HTML, avec le valeur CSS choisie "a-lec" :
+# La sortie de cette liste en HTML, avec le préfix CSS choisi "a-lec" :
 
 <ul class="a-lec_list a-lec_list-ul couverture couverture-ul">
   <li class="a-lec_li a-lec_li-1">Livre 1</li>
diff --git a/var/lib/stl/scripts/manage__HTML b/var/lib/stl/scripts/manage__HTML
index 2c906d7..48ac938 100644
--- a/var/lib/stl/scripts/manage__HTML
+++ b/var/lib/stl/scripts/manage__HTML
@@ -257,6 +257,8 @@ domain__get
 
 create__RSS_feed
 rsync -a --exclude ".*" "$domain_dir_wip/" "$domain_dir_www/"
+
+# Log
 this_article="$domain_dir_www"
 log__add -i -M WWW "Synced WIP server to WWW server"
 }
diff --git a/var/lib/stl/scripts/manage__domain b/var/lib/stl/scripts/manage__domain
index 30732f6..bff60b1 100644
--- a/var/lib/stl/scripts/manage__domain
+++ b/var/lib/stl/scripts/manage__domain
@@ -109,8 +109,8 @@ if__writeable "$PWD"
     else
       read -rp "- Use 'https://' protocol (N for 'http://') ? " set_prot
       case "$set_prot" in
-        Y) domain_protocol="https://" ;;
-        N) domain_protocol="http://" ;;
+        Y) domain_protocol="https://"   ;;
+        N) domain_protocol="http://"    ;;
         *) echo "# Maybe later...";exit ;;
       esac
       domain_ask+="$domain_name"
@@ -158,9 +158,9 @@ domain_srv="$srv_uri/$domain_name"
 # Installation: server or local
 read -rp "- STL server installed (Y|N for local ; use wip only) ? " install
 case "$install" in
-  Y) stl_install="server" ;;
-  N) stl_install="local" ;;
-  *) echo "# Maybe later..." ;;
+  Y|y) stl_install="server"    ;;
+  N|n) stl_install="local"     ;;
+  *)   echo "# Maybe later..." ;;
 esac
 
 # Domain TITLE
@@ -202,7 +202,7 @@ is__set "$domain_sidebar_items"
   && echo "! $domain_sidebar_items is not between 1-24" \
   && exit
 
-# Domain  CSS PREFIX
+# Domain CSS PREFIX
 read -rp "- Domain CSS prefix (alnum,-) ? " domain_css
 is__set "$domain_css"
 
@@ -222,12 +222,21 @@ read -rp "- Domain logo filename ? " domain_logo
 # External URL Profile
 read -rp "- Domain external URL Profile ? " domain_ext_url
 
+# Statoolinfos
+read -rp "- Generate file stats (Statoolinfos) ? " domain_stats
+case "$domain_stats" in
+  Y|y) domain_stats="yes"      ;;
+  N|n) domain_stats="no"       ;;
+  *)   echo "# Maybe later..." ;;
+esac
+
 # Resume before writing conf
 # ------
 clear
 echo -e "# Resume configuration...\n"
 cat <<EODOMAINCONF
 STL Inslallation     : $stl_install
+STL stats generator  : $domain_stats
 Domain Directory     : $PWD
 Domain               : $domain_name
 URL                  : $domain_protocol$domain_name
@@ -285,6 +294,7 @@ domain_ext_url="$domain_ext_url"
 # You must know what you do if you change from here...
 # STL configurationn
 stl_install="$stl_install"
+domain_stats="$domain_stats"
 domain_db_articles="$stl_dir_db/$domain_name/articles"
 domain_conf="$PWD/$stl_file_pwd_conf"
 
@@ -337,13 +347,13 @@ case "$stl_install" in
     ;;
 
   local)
-    mkdir -p "$domain_srv/www"
-    mkdir -p "$domain_srv/www/template"
-    mkdir -p "$domain_srv/www/files"
-    mkdir -p "$domain_srv/www/images"
+    mkdir -p "$domain_srv/wip"
+    mkdir -p "$domain_srv/wip/template"
+    mkdir -p "$domain_srv/wip/files"
+    mkdir -p "$domain_srv/wip/images"
     
     printf '%s\n\n' \
-       "! You logo must be put in $domain_srv/www/template"
+       "! You logo must be put in $domain_srv/wip/template"
     ;;
 esac
 }