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/
$//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 ""
ORA_INVENTORY=$(cat /etc/oraInst.loc | grep inventory_loc | cut -d= -f2)
cat $ORA_INVENTORY/ContentsXML/inventory.xml
+echo "
"
# opatch
+echo "Opatch lspatches
"
+echo ""
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 ""
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
host ulimit -a | sort
prompt
-prompt ulimit -a
-prompt
-host /bin/sh sql/10b_oracle_installation.sh
-prompt
-
exit
\ No newline at end of file