From 4e0a25af1e2c27c044cd8a6deb38abd73bca88a0 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Dec 2019 22:07:10 +0100
Subject: [PATCH] homematic: Collection of small improvements (#907)

* homematic: Prettier YAML files

* homematic: Update add-on URL

* homematic: Remove tabs from shell scripts

* homematic: Remove curl, as it is in the base image

* homematic: Create all folders in a single command in Dockerfile

* homematic: Tweak documentation
---
 homematic/Dockerfile          | 14 +++++++-------
 homematic/README.md           |  2 +-
 homematic/azure-pipelines.yml | 15 +++++++--------
 homematic/config.json         |  2 +-
 homematic/data/hm-firmware.sh |  2 +-
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/homematic/Dockerfile b/homematic/Dockerfile
index 6de2a64..f2b1074 100644
--- a/homematic/Dockerfile
+++ b/homematic/Dockerfile
@@ -8,7 +8,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update \
     && mkdir -p /usr/share/man/man1 \
     && apt-get install -y --no-install-recommends \
-        curl \
         libusb-1.0 \
         lighttpd \
         openjdk-11-jre-headless \
@@ -21,12 +20,13 @@ ARG BUILD_ARCH
 WORKDIR /usr/src
 RUN curl -SL https://github.com/jens-maus/occu/archive/${OCCU_VERSION}.tar.gz | tar xzf - \
     && cd occu-${OCCU_VERSION} \
-    && mkdir -p /opt/hm \
-    && mkdir -p /opt/hm/etc/config \
-    && mkdir -p /opt/HmIP \
-    && mkdir -p /opt/HMServer \
-    && mkdir -p /var/status \
-    && mkdir -p /boot \
+    && mkdir -p \
+        /boot \
+        /opt/hm \
+        /opt/hm/etc/config \
+        /opt/HmIP \
+        /opt/HMServer \
+        /var/status \
     \
     && echo "VERSION=${OCCU_VERSION}" > /boot/VERSION \
     && cp /boot/VERSION /VERSION \
diff --git a/homematic/README.md b/homematic/README.md
index 50156d8..49b5a40 100644
--- a/homematic/README.md
+++ b/homematic/README.md
@@ -21,7 +21,7 @@ to interface with your devices.
 
 ## Installation
 
-The installation of this add-on is straightforward and easy to do.
+Follow these steps to get the add-on installed on your system:
 
 1. Navigate in your Home Assistant frontend to **Hass.io** -> **Add-on Store**.
 2. Find the "HomeMatic CCU" add-on and click it.
diff --git a/homematic/azure-pipelines.yml b/homematic/azure-pipelines.yml
index f4a47d5..1c7910e 100644
--- a/homematic/azure-pipelines.yml
+++ b/homematic/azure-pipelines.yml
@@ -3,20 +3,19 @@
 trigger:
   branches:
     include:
-    - master
+      - master
   paths:
     include:
-    - homematic/*
+      - homematic/*
 pr: none
 
 variables:
   - name: versionBuilder
-    value: '2.0'
+    value: "2.0"
   - group: docker
 
-
 jobs:
-- template: /.azure/azp-template-addon.yml
-  parameters:
-    addon: 'homematic'
-    arch: '--armv7 --i386'
+  - template: /.azure/azp-template-addon.yml
+    parameters:
+      addon: "homematic"
+      arch: "--armv7 --i386"
diff --git a/homematic/config.json b/homematic/config.json
index c2a39dd..7e55401 100644
--- a/homematic/config.json
+++ b/homematic/config.json
@@ -3,7 +3,7 @@
   "version": "9.3",
   "slug": "homematic",
   "description": "HomeMatic central based on OCCU",
-  "url": "https://home-assistant.io/addons/homematic/",
+  "url": "hhttps://github.com/home-assistant/hassio-addons/tree/master/homematic",
   "arch": ["armv7", "i386"],
   "map": ["share:rw"],
   "startup": "system",
diff --git a/homematic/data/hm-firmware.sh b/homematic/data/hm-firmware.sh
index c664ad1..353cdb2 100755
--- a/homematic/data/hm-firmware.sh
+++ b/homematic/data/hm-firmware.sh
@@ -29,7 +29,7 @@ function firmware_update_rfd() {
 
 
 function firmware_update_wired() {
-	if "${HM_HOME}/bin/eq3configcmd" update-lgw-firmware -m /firmware/fwmap -c /etc/config/hs485d.conf -l 1; then
+    if "${HM_HOME}/bin/eq3configcmd" update-lgw-firmware -m /firmware/fwmap -c /etc/config/hs485d.conf -l 1; then
         bashio::log.info "Wired update was successful"
     else
         bashio::log.error "Wired update fails!"