From eb53a0f481bf7f507e2a4675491b5b027e8cb662 Mon Sep 17 00:00:00 2001
From: Yacine31 <yacine.oumghar@gmail.com>
Date: Sun, 12 Nov 2023 04:06:36 +0100
Subject: [PATCH] ajout de rep shell

---
 rapport_mensuel.sh                                     | 10 ++++++++--
 .../10_oracle_installation.sh                          |  5 +++++
 sql/10_os_info.sql                                     |  5 -----
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename sql/10b_oracle_installation.sh => sh/10_oracle_installation.sh (78%)

diff --git a/rapport_mensuel.sh b/rapport_mensuel.sh
index 5555259..b540e58 100644
--- a/rapport_mensuel.sh
+++ b/rapport_mensuel.sh
@@ -21,14 +21,20 @@ do
 # 
 #         " > ${HTML_FILE}
 
-        # sqlplus -s "/ as sysdba" @rapport_html.sql >> ${HTML_FILE}
         cat sql/00_html_header.html >> ${HTML_FILE}
+
+        # execution des scripts sql
         for f in sql/*.sql
         do
-                # sqlplus -s "/ as sysdba" @$f >> ${HTML_FILE}
                 sed '1 s/^/SET PAGES 999 FEEDBACK OFF MARKUP HTML ON SPOOL ON PREFORMAT OFF ENTMAP OFF\n/' $f | sqlplus -s / as sysdba >> ${HTML_FILE}
         done
 
+        # execution des scripts shell
+        for f in sh/*.sh
+        do
+                /bin/sh $f >> ${HTML_FILE}
+        done
+
         sed -i 's/<table.*>$/<table class="table table-striped">/g' ${HTML_FILE}
 
         cat sql/99_html_footer.html >> ${HTML_FILE}
diff --git a/sql/10b_oracle_installation.sh b/sh/10_oracle_installation.sh
similarity index 78%
rename from sql/10b_oracle_installation.sh
rename to sh/10_oracle_installation.sh
index 179bb97..2b36cc0 100644
--- a/sql/10b_oracle_installation.sh
+++ b/sh/10_oracle_installation.sh
@@ -1,11 +1,16 @@
 # inventory.xml
+echo "<pre>"
 ORA_INVENTORY=$(cat /etc/oraInst.loc | grep inventory_loc | cut -d= -f2)
 cat $ORA_INVENTORY/ContentsXML/inventory.xml
+echo "</pre>"
 
 # opatch 
+echo "<h2>Opatch lspatches</h2>"
+echo "<pre>"
 ORA_HOME=$(cat /etc/oratab | egrep -v "^$|^#" | cut -d: -f2 | sort -u)
 for OH in ${ORA_HOME}
 do 
 	export ORACLE_HOME=${ORA_HOME}; ${ORA_HOME}/OPatch/opatch lspatches 
 done
+echo "</pre>"
 
diff --git a/sql/10_os_info.sql b/sql/10_os_info.sql
index 0118f06..6a65243 100644
--- a/sql/10_os_info.sql
+++ b/sql/10_os_info.sql
@@ -39,9 +39,4 @@ prompt <pre>
 host ulimit -a | sort
 prompt </pre>
 
-prompt <h2>ulimit -a </h2>
-prompt <pre>
-host /bin/sh sql/10b_oracle_installation.sh
-prompt </pre>
-
 exit
\ No newline at end of file