#477 internacionalizacion deployImage

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

1 files changed, 33 insertions, 10 deletions

diff --git a/client/shared/scripts/deployImage b/client/shared/scripts/deployImage
index 0f7a2bad..1969a9ab 100755
--- a/client/shared/scripts/deployImage
+++ b/client/shared/scripts/deployImage
@@ -36,17 +36,40 @@ fi
 echo "[1] $MSG_SCRIPTS_TASK_START  updateCache REPO $2.img $5 $6" | tee -a $OGLOGSESSION $OGLOGFILE
 updateCache REPO $2.img $5 $6 | tee -a $OGLOGCOMMAND
 RETVAL=$?
+
+TIME2=$[SECONDS-TIME1]
+echo "   [ ]  $MSG_SCRIPTS_TIME_PARTIAL updateCache $[TIME2/60]m $[TIME2%60]s" | tee -a $OGLOGSESSION $OGLOGFILE
+
+
+
 if [ "$RETVAL" != "0" ]
 then
-	echo "[49] $MSG_SCRIPTS_TASK_ERR = $RETVAL  ; updateCache REPO $2.img $5 $6 " | tee -a $OGLOGSESSION $OGLOGFILE
+	echo "[100] $MSG_SCRIPTS_TASK_ERR = $RETVAL  ; updateCache REPO $2.img $5 $6 " | tee -a $OGLOGSESSION $OGLOGFILE
 	# RC=15 No hay cache
 	# RC=16 no hay espacio sufiente
-	exit $RETVAL
-	
-else
-	echo "[50] $MSG_SCRIPTS_TASK_START  ogRestore CACHE /$2 $3 $4" | tee -a $OGLOGSESSION $OGLOGFILE
-	ogRestoreImage CACHE /$2 $3 $4 &>> $OGLOGCOMMAND
-	RETVAL=$?
-	[ "$RETVAL" == "0" ] && configureOs $3 $4 | tee -a $OGLOGCOMMAND
-	exit $RETVAL 
-fi
\ No newline at end of file
+	exit $RETVAL	
+fi
+
+
+
+
+TIME2=$SECONDS
+echo "[50] $MSG_SCRIPTS_TASK_START  ogRestore CACHE /$2 $3 $4" | tee -a $OGLOGSESSION $OGLOGFILE
+ogRestoreImage CACHE /$2 $3 $4 &>> $OGLOGCOMMAND
+RETVAL=$?
+if [ "$RETVAL" == "0" ] 
+then
+	RESUMERESTOREIMAGE=$(cat $OGLOGCOMMAND | grep "Total Time:")
+	echo "   [ ]      $RESUMERESTOREIMAGE " | tee -a $OGLOGSESSION $OGLOGFILE
+	echo "   [ ]      $MSG_SCRIPTS_TIME_PARTIAL : $[TIME2/60]m $[TIME2%60]s" | tee -a $OGLOGSESSION $OGLOGFILE
+	TIME2=$[SECONDS-TIME2]
+	echo "[90] $MSG_SCRIPTS_OS_CONFIGURE " | tee -a $OGLOGSESSION $OGLOGFILE
+	configureOs $3 $4 | tee -a $OGLOGCOMMAND
+fi
+ 
+TIME=$[SECONDS-TIME1]
+echo "[100] $MSG_SCRIPTS_TIME_TOTAL $[TIME/60]m $[TIME%60]s" | tee -a $OGLOGSESSION $OGLOGFILE
+
+
+
+exit $RETVAL
\ No newline at end of file