From aff51f34b8b1fd899695489ad848bf42ed3a7ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 4 Mar 2019 10:03:10 +0200
Subject: [PATCH] ssh: Update hassio cli to 2.1.0 (#527)

* ssh: Update hassio cli to 2.1.0

* ssh: Grammar and spelling fixes

* Update config.json
---
 ssh/CHANGELOG.md | 3 +++
 ssh/Dockerfile   | 2 +-
 ssh/build.json   | 2 +-
 ssh/config.json  | 2 +-
 ssh/run.sh       | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index b1618d9..4bd84da 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 5.2
+- Update Hass.io CLI to 2.1.0
+
 ## 5.1
 - Map all serial devices into container for manual adjustments
 
diff --git a/ssh/Dockerfile b/ssh/Dockerfile
index ab238ef..55f6fb6 100644
--- a/ssh/Dockerfile
+++ b/ssh/Dockerfile
@@ -22,7 +22,7 @@ ARG CLI_VERSION
 RUN apk add --no-cache curl \
     && curl -Lso /usr/bin/hassio https://github.com/home-assistant/hassio-cli/releases/download/${CLI_VERSION}/hassio_${BUILD_ARCH} \
     && chmod a+x /usr/bin/hassio \
-    && /usr/bin/hassio completion | sed "s/hassio-cli/hassio/g" > /usr/share/bash-completion/completions/hassio
+    && /usr/bin/hassio completion > /usr/share/bash-completion/completions/hassio
 
 # Copy data
 COPY run.sh /
diff --git a/ssh/build.json b/ssh/build.json
index 0f9e72e..1690d59 100644
--- a/ssh/build.json
+++ b/ssh/build.json
@@ -1,5 +1,5 @@
 {
   "args": {
-    "CLI_VERSION": "2.0.1"
+    "CLI_VERSION": "2.1.0"
   }
 }
diff --git a/ssh/config.json b/ssh/config.json
index 4d9cff8..428f584 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH server",
-  "version": "5.1",
+  "version": "5.2",
   "slug": "ssh",
   "description": "Allows connections over SSH",
   "url": "https://home-assistant.io/addons/ssh/",
diff --git a/ssh/run.sh b/ssh/run.sh
index 30d8855..c0468af 100755
--- a/ssh/run.sh
+++ b/ssh/run.sh
@@ -28,7 +28,7 @@ elif [ -n "$PASSWORD" ]; then
     sed -i s/#PasswordAuthentication.*/PasswordAuthentication\ yes/ /etc/ssh/sshd_config
     sed -i s/#PermitEmptyPasswords.*/PermitEmptyPasswords\ no/ /etc/ssh/sshd_config
 else
-    echo "[Error] You need setup a login!"
+    echo "[Error] You need to setup a login!"
     exit 1
 fi
 
@@ -44,7 +44,7 @@ else
     cp -fp "$KEYS_PATH"/* /etc/ssh/
 fi
 
-# Persist shell history by redirecting .ash_history to /data
+# Persist shell history by redirecting .bash_history to /data
 touch /data/.bash_history
 chmod 600 /data/.bash_history
 ln -s -f /data/.bash_history /root/.bash_history