From 6ea63acc512e72475ddef8cd22458e8d99fe12cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Sun, 25 Mar 2018 17:47:19 +0200 Subject: [PATCH 1/6] Added option to upgrade to spesific version --- docs/homeassistant.md | 5 +++++ package/opt/hassbian/suites/homeassistant.sh | 3 +++ package/usr/local/bin/hassbian-config | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/docs/homeassistant.md b/docs/homeassistant.md index e80f61ec..270dbc8d 100644 --- a/docs/homeassistant.md +++ b/docs/homeassistant.md @@ -23,6 +23,11 @@ $ sudo hassbian-config upgrade homeassistant --beta $ sudo hassbian-config upgrade homeassistant --dev ``` +## Upgrade to to an spesific version +``` +$ sudo hassbian-config upgrade homeassistant=0.65.6 +``` + ## Additional info Running as: `homeassistant` Configuration dir: `/home/homeassistant/.homeassistant/` diff --git a/package/opt/hassbian/suites/homeassistant.sh b/package/opt/hassbian/suites/homeassistant.sh index 7a6e82de..6c349385 100644 --- a/package/opt/hassbian/suites/homeassistant.sh +++ b/package/opt/hassbian/suites/homeassistant.sh @@ -77,6 +77,9 @@ else echo "Checking current version" if [ "$BETA" == "true" ]; then newversion=$(curl -s https://pypi.python.org/pypi/homeassistant/json | grep '"version":' | awk -F'"' '{print $4}') + elif [ ! -z "${VERSIONNUMBER}" ]; then + echo "Spesicic version number supplied, skipping version check..." + newversion="$VERSIONNUMBER" else newversion=$(curl -s https://api.github.com/repos/home-assistant/home-assistant/releases/latest | grep tag_name | awk -F'"' '{print $4}') fi diff --git a/package/usr/local/bin/hassbian-config b/package/usr/local/bin/hassbian-config index 94dc4ec6..59f6469b 100755 --- a/package/usr/local/bin/hassbian-config +++ b/package/usr/local/bin/hassbian-config @@ -256,6 +256,12 @@ case $COMMAND in shift # past value ;; "upgrade") + if [[ "$SUITE" = *"="* ]]; then + VERSIONNUMBER=$(echo "$SUITE" | awk -F'=' '{print $2}') + SUITE=$(echo "$SUITE" | awk -F'=' '{print $1}') + else + VERSIONNUMBER="" + fi if verify-suite "$SUITE"; then RUN="upgrade-suite $SUITE" else From 39d094e2a66adef7062c853d112b7ff145a44eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Sun, 25 Mar 2018 17:59:56 +0200 Subject: [PATCH 2/6] Exit if version does not exist --- package/opt/hassbian/suites/homeassistant.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/opt/hassbian/suites/homeassistant.sh b/package/opt/hassbian/suites/homeassistant.sh index 6c349385..245d0788 100644 --- a/package/opt/hassbian/suites/homeassistant.sh +++ b/package/opt/hassbian/suites/homeassistant.sh @@ -78,8 +78,14 @@ else if [ "$BETA" == "true" ]; then newversion=$(curl -s https://pypi.python.org/pypi/homeassistant/json | grep '"version":' | awk -F'"' '{print $4}') elif [ ! -z "${VERSIONNUMBER}" ]; then - echo "Spesicic version number supplied, skipping version check..." - newversion="$VERSIONNUMBER" + verify=$(curl -s https://pypi.python.org/pypi/homeassistant/"$VERSIONNUMBER"/json) + if [[ "$verify" = *"Not Found"* ]]; then + echo "Version $VERSIONNUMBER Not found..." + echo "Exiting..." + return 0 + else + newversion="$VERSIONNUMBER" + fi else newversion=$(curl -s https://api.github.com/repos/home-assistant/home-assistant/releases/latest | grep tag_name | awk -F'"' '{print $4}') fi From 0d419b273c34c2fd923b7692677926174e45d3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 26 Mar 2018 19:11:48 +0200 Subject: [PATCH 3/6] Typo --- package/opt/hassbian/suites/homeassistant.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opt/hassbian/suites/homeassistant.sh b/package/opt/hassbian/suites/homeassistant.sh index c8994d30..feb147cf 100644 --- a/package/opt/hassbian/suites/homeassistant.sh +++ b/package/opt/hassbian/suites/homeassistant.sh @@ -80,7 +80,7 @@ else elif [ ! -z "${VERSIONNUMBER}" ]; then verify=$(curl -s https://pypi.python.org/pypi/homeassistant/"$VERSIONNUMBER"/json) if [[ "$verify" = *"Not Found"* ]]; then - echo "Version $VERSIONNUMBER Not found..." + echo "Version $VERSIONNUMBER not found..." echo "Exiting..." return 0 else From f96741f0c3fc61e11c37ec7911395b597b627db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 26 Mar 2018 19:20:07 +0200 Subject: [PATCH 4/6] Typo --- package/opt/hassbian/suites/homeassistant.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opt/hassbian/suites/homeassistant.sh b/package/opt/hassbian/suites/homeassistant.sh index feb147cf..f5922872 100644 --- a/package/opt/hassbian/suites/homeassistant.sh +++ b/package/opt/hassbian/suites/homeassistant.sh @@ -108,7 +108,7 @@ sudo -u homeassistant -H /bin/bash << EOF echo "Changing to Home Assistant venv" source /srv/homeassistant/bin/activate -echo "Installing latest version of Home Assistant" +echo "Upgrading Home Assistant" pip3 install --upgrade setuptools wheel if [ "$DEV" == "true" ]; then pip3 install git+https://github.com/home-assistant/home-assistant@dev From 35f79f730f27ba478de52102481683d5c534bc00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 26 Mar 2018 19:28:22 +0200 Subject: [PATCH 5/6] Wording --- package/opt/hassbian/suites/homeassistant.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opt/hassbian/suites/homeassistant.sh b/package/opt/hassbian/suites/homeassistant.sh index f5922872..0e5f50da 100644 --- a/package/opt/hassbian/suites/homeassistant.sh +++ b/package/opt/hassbian/suites/homeassistant.sh @@ -89,7 +89,7 @@ else else newversion=$(curl -s https://api.github.com/repos/home-assistant/home-assistant/releases/latest | grep tag_name | awk -F'"' '{print $4}') fi - sudo -u homeassistant -H /bin/bash << EOF | grep Version | awk '{print $2}'|while read -r version; do if [[ "${newversion}" == "${version}" ]]; then echo "You already have the latest version: $version";exit 1;fi;done + sudo -u homeassistant -H /bin/bash << EOF | grep Version | awk '{print $2}'|while read -r version; do if [[ "${newversion}" == "${version}" ]]; then echo "You already have version: $version";exit 1;fi;done source /srv/homeassistant/bin/activate pip3 show homeassistant EOF From e411d04d8630d2a12b6dc9beccdc75ed74060c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 26 Mar 2018 19:30:55 +0200 Subject: [PATCH 6/6] Grammar --- docs/homeassistant.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/homeassistant.md b/docs/homeassistant.md index 270dbc8d..691c3d90 100644 --- a/docs/homeassistant.md +++ b/docs/homeassistant.md @@ -23,7 +23,7 @@ $ sudo hassbian-config upgrade homeassistant --beta $ sudo hassbian-config upgrade homeassistant --dev ``` -## Upgrade to to an spesific version +## Upgrade to to a spesific version ``` $ sudo hassbian-config upgrade homeassistant=0.65.6 ```