From b9fed3a965a997b8d8e9c301c1423bd765e3251b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 28 Feb 2017 10:16:33 +0000
Subject: [PATCH] SSDM-4507: bug fixed in restore-config-from-backup.sh.
common-functions.sh: restore function less verbose
SVN: 37826
---
installation/resource/installer/bin/common-functions.sh | 1 -
.../resource/installer/bin/restore-config-from-backup.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/installation/resource/installer/bin/common-functions.sh b/installation/resource/installer/bin/common-functions.sh
index 3ab92be0f24..e56832bdff9 100644
--- a/installation/resource/installer/bin/common-functions.sh
+++ b/installation/resource/installer/bin/common-functions.sh
@@ -311,7 +311,6 @@ restore()
local file=$3
if [ -e "$source_file" ]; then
if [ -e "$destination/$file" ]; then
- echo "cp -p $destination/$file $destination/$file.$version"
cp -p "$destination/$file" "$destination/$file.$version"
fi
echo "cp -p $source_file $destination/$file"
diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh
index a693685df55..1df8a1f1076 100755
--- a/installation/resource/installer/bin/restore-config-from-backup.sh
+++ b/installation/resource/installer/bin/restore-config-from-backup.sh
@@ -47,7 +47,7 @@ if [ -d $ROOT/openBIS-server ]; then
fi
# -- DSS
-version=`unzip -c $ROOT/servers/datastore_server/lib/datastore_server-*.jar BUILD-datastore_server.INFO|tail -n 1`
+version=`unzip -c $ROOT/datastore_server/lib/datastore_server-*.jar BUILD-datastore_server.INFO|tail -n 1`
restore $CONF/dss-service.properties $ROOT/datastore_server/etc service.properties
restore $CONF/dss-log.xml $ROOT/datastore_server/etc log.xml
restore $CONF/datastore_server.conf $ROOT/datastore_server/etc datastore_server.conf
--
GitLab