#640: Scripts de interfaz adaptados al nuevo formato de la función {{{ogEcho}}}.

git-svn-id: https://opengnsys.es/svn/branches/version1.0@4186 a21b9725-9963-47de-94b9-378ad31fedc9

8 files changed, 19 insertions, 20 deletions

diff --git a/admin/Interface/Configurar b/admin/Interface/Configurar
index 9b0a6811..a10143f3 100755
--- a/admin/Interface/Configurar
+++ b/admin/Interface/Configurar
@@ -10,7 +10,7 @@
 echo " " > $OGLOGSESSION; echo " " > $OGLOGCOMMAND; echo " " > ${OGLOGCOMMAND}.tmp
 	
 # Registro de inicio de ejecución
-echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+ogEcho log session "$MSG_INTERFACE_START $0 $*"
 
 # Solo ejecutable por OpenGnSys Client.
 PATH=$PATH:$(dirname $0)
diff --git a/admin/Interface/CrearImagen b/admin/Interface/CrearImagen
index 89391ed3..ca642845 100755
--- a/admin/Interface/CrearImagen
+++ b/admin/Interface/CrearImagen
@@ -40,8 +40,7 @@ TIME1=$SECONDS
 echo " " > $OGLOGSESSION; echo " " > $OGLOGCOMMAND; echo " " > ${OGLOGCOMMAND}.tmp
 
 # Registro de inicio de ejecución
-#echo "[START Interface ] Run this command: $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
-echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+ogEcho log session "$MSG_INTERFACE_START $0 $*"
 
 # Solo ejecutable por OpenGnSys Client.
 PATH=$PATH:$(dirname $0)
@@ -94,8 +93,7 @@ RETVAL=$?
 #fi
 
 # Registro de fin de ejecución
-#echo "[END Interface] Command finished with this code:  $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
-echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+ogEcho log session "$MSG_INTERFACE_END $RETVAL"
 
 exit $RETVAL
 
diff --git a/admin/Interface/CrearImagenBasica b/admin/Interface/CrearImagenBasica
index 20607f9b..069b0164 100755
--- a/admin/Interface/CrearImagenBasica
+++ b/admin/Interface/CrearImagenBasica
@@ -49,7 +49,7 @@
 	echo -n "" > $OGLOGSESSION; echo -n  "" > $OGLOGCOMMAND
 
 	# Registro de inicio de ejecución
-	echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_START $0 $*"
 
 	# Si el destino es REPO y el cliente no está en modo "admin"; activar repositorio para escritura,
 	if [ "$REPO" == "REPO" -a "$boot" != "admin"  ]
@@ -91,7 +91,7 @@
 	[ "$REPO" == "REPO" -a "$boot" != "admin" ] && CambiarAcceso user
 
 	# Registro de fin de ejecución
-	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_END $RETVAL"
 
 
 
diff --git a/admin/Interface/CrearSoftIncremental b/admin/Interface/CrearSoftIncremental
index 69ee9801..16b748f3 100755
--- a/admin/Interface/CrearSoftIncremental
+++ b/admin/Interface/CrearSoftIncremental
@@ -48,7 +48,7 @@
 	echo -n "" > $OGLOGSESSION; echo -n  "" > $OGLOGCOMMAND
 
 	# Registro de inicio de ejecución
-	echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_START $0 $*"
 
 	# Si el destino es REPO y el cliente no está en modo "admin"; activar repositorio para escritura,
 	if [ "$REPO" == "REPO" -a "$boot" != "admin"  ]
@@ -90,6 +90,6 @@
 	[ "$REPO" == "REPO" -a "$boot" != "admin" ] && CambiarAcceso user
 
 	# Registro de fin de ejecución
-	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_END $RETVAL"
 
 	exit $RETVAL
diff --git a/admin/Interface/EjecutarScript b/admin/Interface/EjecutarScript
index 9793290c..50b54a56 100755
--- a/admin/Interface/EjecutarScript
+++ b/admin/Interface/EjecutarScript
@@ -11,7 +11,7 @@ TIME1=$SECONDS
 echo -n "" > $OGLOGSESSION; echo -n  "" > $OGLOGCOMMAND
 
 # Registro de inicio de ejecución
-echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+ogEcho log session "$MSG_INTERFACE_START $0 $*"
 
 echo -e "\n Instrucciones a ejecutar: *****************************" >>  $OGLOGFILE
 cat  $1 >> $OGLOGFILE
@@ -29,15 +29,15 @@ RETVAL=$?
 TIME=$[SECONDS-TIME1]
 if [ $RETVAL == 0 ]
 then
-	echo "[100] Duracion de la operacion $[TIME/60]m $[TIME%60]s" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "[100] Duracion de la operacion $[TIME/60]m $[TIME%60]s"
 else
-	echo "ERROR no operacion no realizada" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "ERROR: operacion no realizada"
 fi
 
 
 # Registro de fin de ejecución
-echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
-
+ogEcho log session "$MSG_INTERFACE_END $RETVAL"
 
 
 exit $RETVAL
+
diff --git a/admin/Interface/InventarioSoftware b/admin/Interface/InventarioSoftware
index 715f061c..fa96565d 100755
--- a/admin/Interface/InventarioSoftware
+++ b/admin/Interface/InventarioSoftware
@@ -9,10 +9,11 @@ TIME1=$SECONDS
 echo -n " " | tee  $OGLOGSESSION $OGLOGCOMMAND ${OGLOGCOMMAND}.tmp
 
 # Registro de inicio de ejecución
-echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+ogEcho log session "$MSG_INTERFACE_START $0 $*"
 
 file=$(listSoftwareInfo $1 $2)
 cp $file $3
 
 TIME=$[SECONDS-TIME1]
-echo "   [ ]      $MSG_SCRIPTS_TIME_PARTIAL : $[TIME/60]m $[TIME%60]s" | tee -a $OGLOGSESSION $OGLOGFILE
+ogEcho log session "   [ ]      $MSG_SCRIPTS_TIME_PARTIAL : $[TIME/60]m $[TIME%60]s"
+
diff --git a/admin/Interface/RestaurarImagenBasica b/admin/Interface/RestaurarImagenBasica
index 73ddb0e2..c87b3183 100755
--- a/admin/Interface/RestaurarImagenBasica
+++ b/admin/Interface/RestaurarImagenBasica
@@ -50,7 +50,7 @@
         echo -n  "" > $OGLOGSESSION; echo " " > $OGLOGCOMMAND
 
 	# Registro de inicio de ejecución
-	echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_START $0 $*"
 	
 	if [ $9 -eq 1 ]; then
 		#sincronizacion1 
@@ -84,6 +84,6 @@
 	fi
 
 	# Registro de fin de ejecución
-	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_END $RETVAL"
 
 	exit $RETVAL
diff --git a/admin/Interface/RestaurarSoftIncremental b/admin/Interface/RestaurarSoftIncremental
index 2774dabc..ee895d9a 100755
--- a/admin/Interface/RestaurarSoftIncremental
+++ b/admin/Interface/RestaurarSoftIncremental
@@ -42,7 +42,7 @@
         echo " " > $OGLOGSESSION; echo " " > $OGLOGCOMMAND
 
 	# Registro de inicio de ejecución
-	echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_START $0 $*"
 
 
 	if [ ${10} -eq 1 ]; then
@@ -77,6 +77,6 @@
 	fi
 
 	# Registro de fin de ejecución
-	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+	ogEcho log session "$MSG_INTERFACE_END $RETVAL"
 
 	exit $RETVAL