From 04c1226c80855a4ea0b0c9b4fcb6551d79cdb7a4 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Tue, 15 Apr 2008 15:20:35 +0000
Subject: [PATCH] added/fixed missing integrity-test else-case during deploy in
 case that we update with a tar file

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4700 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/yacy/yacyVersion.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/source/de/anomic/yacy/yacyVersion.java b/source/de/anomic/yacy/yacyVersion.java
index dd34411eb..eeb42f28a 100644
--- a/source/de/anomic/yacy/yacyVersion.java
+++ b/source/de/anomic/yacy/yacyVersion.java
@@ -413,9 +413,11 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
                 "#!/bin/sh" + serverCore.LF_STRING +
                 "cd " + sb.getRootPath() + "/DATA/RELEASE/" + serverCore.LF_STRING +
                 ((releaseFile.getName().endsWith(".gz")) ?
+                        // test gz-file for integrity and tar xfz then
                        ("if gunzip -t " + releaseFile.getAbsolutePath() + serverCore.LF_STRING +
                         "then" + serverCore.LF_STRING + 
                         "gunzip -c " + releaseFile.getAbsolutePath() + " | tar xf -" + serverCore.LF_STRING) :
+                        // just tar xf the file, no integrity test possible?
                        ("tar xf " + releaseFile.getAbsolutePath() + serverCore.LF_STRING)
                 ) +
                 "while [ -f ../yacy.running ]; do" + serverCore.LF_STRING +
@@ -423,11 +425,16 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
                 "done" + serverCore.LF_STRING +
                 "cp -Rf yacy/* " + apphome + serverCore.LF_STRING +
                 "rm -Rf yacy" + serverCore.LF_STRING +
-                "else" + serverCore.LF_STRING +
-                "while [ -f ../yacy.running ]; do" + serverCore.LF_STRING +
-                "sleep 1" + serverCore.LF_STRING +
-                "done" + serverCore.LF_STRING +
-                "fi" + serverCore.LF_STRING +
+                ((releaseFile.getName().endsWith(".gz")) ?
+                        // else-case of gunzip -t test: if failed, just restart
+                       ("else" + serverCore.LF_STRING +
+                        "while [ -f ../yacy.running ]; do" + serverCore.LF_STRING +
+                        "sleep 1" + serverCore.LF_STRING +
+                        "done" + serverCore.LF_STRING +
+                        "fi" + serverCore.LF_STRING) :
+                        // in case that we did not made the integrity test, there is no else case
+                        ""
+                ) +
                 "cd " + apphome + serverCore.LF_STRING +
                 "nohup ./startYACY.sh > /dev/null" + serverCore.LF_STRING;
             File scriptFile = new File(sb.getRootPath(), "DATA/RELEASE/update.sh");