From c129258380238a342974b9fbbbaa66e47382a6ff Mon Sep 17 00:00:00 2001
From: Youssef <agoussalyo@eisti.eu>
Date: Mon, 2 Aug 2021 18:53:49 +0200
Subject: [PATCH] =?UTF-8?q?Messages=20d'=C3=A9tapes=20sur=20le=20script=20?=
 =?UTF-8?q?d'install?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ Desactivation temporaire de la copie du .conf de add_repo
---
 add_repo.sh | 15 ++++++++-------
 install.sh  | 13 +++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/add_repo.sh b/add_repo.sh
index 5b6cea6..b33810e 100644
--- a/add_repo.sh
+++ b/add_repo.sh
@@ -56,13 +56,14 @@ if [ -e "$src/www" ]; then
 fi
 
 # installs virtualhosts
-if [ -e "$src"/sites-available ]; then
-  cp -vra "$src"/sites-available/. $a2/sites-available
-  for f in "$src"/sites-available/*.conf; do
-    a2ensite "$(basename "$f")"
-  done
-  systemctl reload apache2
-fi
+#if [ -e "$src"/sites-available ]; then
+ # cp -vra "$src"/sites-available/. $a2/sites-available
+ # for f in "$src"/sites-available/*.conf; do
+#    a2ensite "$(basename "$f")"
+ # done
+ # systemctl reload apache2
+# fi
+
 # TODO bash 3 +
 # TODO add installation of locale folder
 # TODO add installation of the cog's requirements.txt
diff --git a/install.sh b/install.sh
index c5f88b1..6973ce6 100755
--- a/install.sh
+++ b/install.sh
@@ -69,9 +69,12 @@ if [ ! -e $install_folder/.bot_token ]; then
   echo
   exit
 fi
+if [ -e $install_folder/.bot_token ]; then
+  echo '## Token déjà saisi'
+  exit
+fi
 
-
-echo 'Installation du bot terminée.'
+echo '## Installation du bot terminée.'
 echo
 
 echo '## Begin webserver installation'
@@ -86,9 +89,3 @@ a2enmod cgid
 systemctl restart apache2
 
 # TODO add user name
-
-
-
-
-
-