2.2.0.006 snapshot (#84)

* Update INFO Add file location wizard and UI preparation * Create Folder WIZARD_UIFILES * Add files via upload Add file location wizard and UI preparation * Update installer.sh Fixes backup strategy by selecting another location as before * Add files via upload Change wizard description and add html unicode * Update INFO Add a install logfile (/var/log/openHAB2-install.log) * Update installer.sh Add a install logfile (/var/log/openHAB2-install.log) Fixes the conf and addons restore
openhab · Jul 31, 2017 · 5e91cc0 · 5e91cc0
1 parent 98fa4b8
commit 5e91cc0
Show file tree

Hide file tree

Showing 7 changed files with 205 additions and 46 deletions.
diff --git a/INFO b/INFO
@@ -1,15 +1,17 @@
 package="openHAB2"
-version="2.2.0.005-SNAPSHOT"
+version="2.2.0.006-SNAPSHOT"
 maintainer="openHAB.org"
 maintainer_url="http://openhab.org/"
 distributor="cniweb, tim, dieter, dominic, schoppax"
 description="The open Home Automation Bus 2 (openHAB2) project aims at providing a universal integration platform for all things around home automation. If the directory /volume1/public/openHAB2/conf exists, this directory will be used for all openHAB2 configuration files."
 arch="noarch"
 firmware="4.0-0001"
+dsmuidir="ui"
+dsmappname="SYNO.SDS.OH2.Instance"
 adminurl="/start/index"
 adminport="8080"
 helpurl="https://community.openhab.org/"
 package_icon="PACKAGE_ICON.PNG"
 package_icon_120="PACKAGE_ICON_120.PNG"
 startable="yes"
-changelog="2.2.0.005-SNAPSHOT 27.07.2017: Fix TimeZone bug for all DSM versions,2.2.0.004-SNAPSHOT 20.07.2017: Fix public folder permissions, replace 7z with tar and backup fix,2.2.0.003-SNAPSHOT 18.07.2017: Fix public folder,2.2.0.002-SNAPSHOT 12.07.2017: Update from openHAB 2.1.0.007,02.07.2017: Update to openHAB 2.2.0-SNAPSHOT,2.1.0.004-SNAPSHOT 13.03.2017: Update to openHAB 2.1.0-SNAPSHOT,2.1.0.003-SNAPSHOT 06.02.2017: Update to openHAB 2.1.0-SNAPSHOT,2.1.0.002-SNAPSHOT 30.01.2017: Update to openHAB 2.1.0-SNAPSHOT,2.1.0.001-SNAPSHOT 24.01.2017: Update to openHAB 2.1.0-SNAPSHOT,2.0.0.008-SNAPSHOT 10.11.2016: Update to openHAB 2.0.0-SNAPSHOT,2.0.0.007-SNAPSHOT 23.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.006-SNAPSHOT 23.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.005-SNAPSHOT 20.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.004-SNAPSHOT 09.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.003-beta3 02.06.2016: Update to openHAB 2.0.0-beta3;2.0.0.002-beta2 14.02.2016: Update to openHAB 2.0.0-beta2;2.0.0.001-beta1 31.01.2016: Update to openHAB 2.0.0-beta1"
+changelog="2.2.0.006-SNAPSHOT 31.07.2017: Add file location wizard, install logfile and UI preparation,2.2.0.005-SNAPSHOT 27.07.2017: Fix TimeZone bug for all DSM versions,2.2.0.004-SNAPSHOT 20.07.2017: Fix public folder permissions, replace 7z with tar and backup fix,2.2.0.003-SNAPSHOT 18.07.2017: Fix public folder,2.2.0.002-SNAPSHOT 12.07.2017: Update from openHAB 2.1.0.007,02.07.2017: Update to openHAB 2.2.0-SNAPSHOT,2.1.0.004-SNAPSHOT 13.03.2017: Update to openHAB 2.1.0-SNAPSHOT,2.1.0.003-SNAPSHOT 06.02.2017: Update to openHAB 2.1.0-SNAPSHOT,2.1.0.002-SNAPSHOT 30.01.2017: Update to openHAB 2.1.0-SNAPSHOT,2.1.0.001-SNAPSHOT 24.01.2017: Update to openHAB 2.1.0-SNAPSHOT,2.0.0.008-SNAPSHOT 10.11.2016: Update to openHAB 2.0.0-SNAPSHOT,2.0.0.007-SNAPSHOT 23.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.006-SNAPSHOT 23.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.005-SNAPSHOT 20.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.004-SNAPSHOT 09.10.2016: Update to openHAB 2.0.0-SNAPSHOT;2.0.0.003-beta3 02.06.2016: Update to openHAB 2.0.0-beta3;2.0.0.002-beta2 14.02.2016: Update to openHAB 2.0.0-beta2;2.0.0.001-beta1 31.01.2016: Update to openHAB 2.0.0-beta1"
diff --git a/WIZARD_UIFILES/install_uifile b/WIZARD_UIFILES/install_uifile
@@ -0,0 +1,20 @@
+[{
+    "step_title": "Configuration files",
+    "items": [{
+        "type": "singleselect",
+        "desc": "Choose your destination directory for configuration files:",
+        "subitems": [{
+            "key": "pkgwizard_public_std",
+            "desc": "/public/openHAB2/ <br>(must exist before installing and has to inculde the folders /conf and /addons)",
+            "defaultVaule": true
+        }, {
+            "key": "pkgwizard_public_shome",
+            "desc": "/SmartHome/openHAB2/ <br>(must exist before installing and has to inculde the folders /conf and /addons)",
+            "defaultVaule": false
+        }, {
+            "key": "pkgwizard_home_dir",
+            "desc": "/var/services/homes/openhab2/",
+            "defaultVaule": false
+        }]
+    }]
+}]
diff --git a/WIZARD_UIFILES/install_uifile_de b/WIZARD_UIFILES/install_uifile_de
@@ -0,0 +1,20 @@
+[{
+    "step_title": "Konfigurationsdateien",
+    "items": [{
+        "type": "singleselect",
+        "desc": "W&auml;hle den Zielort f&uuml;r die Konfigurationsdateien:",
+        "subitems": [{
+            "key": "pkgwizard_public_std",
+            "desc": "/public/openHAB2/ <br>(muss vor der Installation existieren und die Ornder /conf and /addons enthalten)",
+            "defaultVaule": true
+        }, {
+            "key": "pkgwizard_public_shome",
+            "desc": "/SmartHome/openHAB2/ <br>(muss vor der Installation existieren und die Ornder /conf and /addons enthalten)",
+            "defaultVaule": false
+        }, {
+            "key": "pkgwizard_home_dir",
+            "desc": "/var/services/homes/openhab2/",
+            "defaultVaule": false
+        }]
+    }]
+}]
diff --git a/WIZARD_UIFILES/upgrade_uifile b/WIZARD_UIFILES/upgrade_uifile
@@ -0,0 +1,20 @@
+[{
+    "step_title": "Configuration files",
+    "items": [{
+        "type": "singleselect",
+        "desc": "Choose your destination directory for configuration files:",
+        "subitems": [{
+            "key": "pkgwizard_public_std",
+            "desc": "/public/openHAB2/ <br>(must exist before installing and has to inculde the folders /conf and /addons)",
+            "defaultVaule": true
+        }, {
+            "key": "pkgwizard_public_shome",
+            "desc": "/SmartHome/openHAB2/ <br>(must exist before installing and has to inculde the folders /conf and /addons)",
+            "defaultVaule": false
+        }, {
+            "key": "pkgwizard_home_dir",
+            "desc": "/var/services/homes/openhab2/",
+            "defaultVaule": false
+        }]
+    }]
+}]
diff --git a/WIZARD_UIFILES/upgrade_uifile_de b/WIZARD_UIFILES/upgrade_uifile_de
@@ -0,0 +1,20 @@
+[{
+    "step_title": "Konfigurationsdateien",
+    "items": [{
+        "type": "singleselect",
+        "desc": "W&auml;hle den Zielort f&uuml;r die Konfigurationsdateien:",
+        "subitems": [{
+            "key": "pkgwizard_public_std",
+            "desc": "/public/openHAB2/ <br>(muss vor der Installation existieren und die Ornder /conf and /addons enthalten)",
+            "defaultVaule": true
+        }, {
+            "key": "pkgwizard_public_shome",
+            "desc": "/SmartHome/openHAB2/ <br>(muss vor der Installation existieren und die Ornder /conf and /addons enthalten)",
+            "defaultVaule": false
+        }, {
+            "key": "pkgwizard_home_dir",
+            "desc": "/var/services/homes/openhab2/",
+            "defaultVaule": false
+        }]
+    }]
+}]
diff --git a/package.tgz b/package.tgz