From 1bef995891b3d9682134c2618d05b0e03e103d3d Mon Sep 17 00:00:00 2001
From: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Date: Mon, 19 Dec 2016 16:03:35 +0100
Subject: [PATCH] init: Correcting upgrade process

Signed-off-by: Thomas Karl Pietrowski <thopiekar@gmail.com> (github: thopiekar)
---
 shared/openHAB.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared/openHAB.sh b/shared/openHAB.sh
index 8ad3b76..cfbbd4e 100644
--- a/shared/openHAB.sh
+++ b/shared/openHAB.sh
@@ -219,8 +219,9 @@ case "$1" in
     ## Migration from the old folder layout to the new:
     ## -> https://github.com/openhab/openhab-distro/pull/318
     # Keeping karaf settings
-    if [ ! -d ${QPKG_DISTRIBUTION}/runtime/karaf/etc ]; then
+    if [ -d ${QPKG_DISTRIBUTION}/runtime/karaf/etc ]; then
         cp -rf ${QPKG_DISTRIBUTION}/runtime/karaf/etc/* ${QPKG_TMP}/userdata/etc
+        rm -rf ${QPKG_DISTRIBUTION}/runtime/karaf/etc
     fi
     # Removing superfluous/orphaned files
     rm -rf ${QPKG_DISTRIBUTION}/userdata/deploy