From e7e3140d9e4bd67c0f578c09230d3073986b8367 Mon Sep 17 00:00:00 2001 From: ramon Date: Wed, 12 Mar 2014 16:30:09 +0000 Subject: #640: Algunos scripts adaptados al nuevo formato de la función {{{ogEcho}}}. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://opengnsys.es/svn/branches/version1.0@4182 a21b9725-9963-47de-94b9-378ad31fedc9 --- client/shared/scripts/restoreImage | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client/shared/scripts/restoreImage') diff --git a/client/shared/scripts/restoreImage b/client/shared/scripts/restoreImage index 64c0940d..9d7b4e6e 100755 --- a/client/shared/scripts/restoreImage +++ b/client/shared/scripts/restoreImage @@ -34,7 +34,7 @@ IMGTYPE="${IMGTYPE:-"img"}" IMGFILE=$(ogGetPath "$REPO" "$IMGNAME.$IMGTYPE") IMGDIR=$(ogGetParentPath "$REPO" "$IMGNAME") if [ "$IMGFILE" == "" -o "$IMGDIR" == "" ]; then - ogRaiseError $OG_ERR_NOTFOUND "$REPO, ${IMGNAME%/*}" + ogRaiseError $OG_ERR_NOTFOUND "$REPO, ${IMGNAME%/*}" exit $? fi @@ -42,7 +42,7 @@ fi case "$PROTO" in UNICAST|UNICAST-DIRECT) # Restaurar la imagen. - echo "[40] ogRestoreImage $REPO $IMGNAME $DISK $PART UNICAST" | tee -a $OGLOGSESSION $OGLOGFILE + ogEcho log session "[40] ogRestoreImage $REPO $IMGNAME $DISK $PART UNICAST" ogRestoreImage "$REPO" "$IMGNAME" "$DISK" "$PART" UNICAST 2>&1 | tee -a $OGLOGCOMMAND RETVAL=${PIPESTATUS[0]} ;; @@ -51,7 +51,7 @@ case "$PROTO" in TOOL=$(ogGetImageProgram REPO $IMGNAME) COMPRESS=$(ogGetImageCompressor REPO $IMGNAME) #TODO comprobar parametros anteriores - echo "[40] ogMcastReceiverPartition $DISK $PART $PORT $TOOL $COMPRESS" | tee -a $OGLOGSESSION $OGLOGFILE + ogEcho log session "[40] ogMcastReceiverPartition $DISK $PART $PORT $TOOL $COMPRESS" ogMcastRequest "$IMGNAME.img" "$PROTOOPT" ogMcastReceiverPartition "$DISK" "$PART" "$PORT" "$TOOL" "$COMPRESS" 2>&1 | tee -a $OGLOGCOMMAND RETVAL=${PIPESTATUS[0]} @@ -62,7 +62,7 @@ case "$PROTO" in esac TIME=$[SECONDS-TIME1] -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" # Código de salida del comando prinicpal de restauración. exit $RETVAL -- cgit v1.2.3-18-g5258