From ceb8b9b1cb1444aa794e1af7b0fb441f1003676d Mon Sep 17 00:00:00 2001 From: Elias Gabrielsson Date: Sun, 4 Aug 2019 23:35:56 +0200 Subject: [PATCH] Final fixes before 1.5 release (#634) Signed-off-by: Elias Gabrielsson --- build-image/openhabian.pi-raspbian.conf | 2 +- docs/openhabian.md | 2 +- functions/menu.bash | 2 -- functions/packages.bash | 28 ++----------------------- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/build-image/openhabian.pi-raspbian.conf b/build-image/openhabian.pi-raspbian.conf index 35e3e63b1..b8188f447 100644 --- a/build-image/openhabian.pi-raspbian.conf +++ b/build-image/openhabian.pi-raspbian.conf @@ -1,7 +1,7 @@ # Modify your openHABian settings # Handle with care, only touch if you need to!! -hostname=openHABianPi +hostname=openhab username=openhabian userpw=openhabian diff --git a/docs/openhabian.md b/docs/openhabian.md index 1e8b28b13..098937ddd 100644 --- a/docs/openhabian.md +++ b/docs/openhabian.md @@ -80,7 +80,7 @@ Learn more about the Raspberry Pi as your platform for openHAB and about the req - [Download the latest "openHABianPi" SD card image file](https://github.com/openhab/openhabian/releases) (Note: the file is *xz* compressed) - Write the image to your SD card (e.g. with [Etcher](https://etcher.io), able to directly work with *xz* files) - Insert the SD card into the Raspberry Pi, connect Ethernet ([Wi-Fi supported](#wifi-setup)) and power -- Wait approximately **15-45 minutes** for openHABian to do its magic +- Wait approximately **15-45 minutes** for openHABian to do its magic.
(You can check the progress in your web-browser [here](http://openhab).) - Enjoy! 🎉 diff --git a/functions/menu.bash b/functions/menu.bash index 09a3b8b8d..54d15b067 100644 --- a/functions/menu.bash +++ b/functions/menu.bash @@ -83,7 +83,6 @@ show_main_menu() { "28 | 1wire" "1wire specific, owserver and related packages" \ "29 | FIND" "Framework for Internal Navigation and Discovery" \ "2A | Tellstick core" "Driver and daemon for Tellstick usb devices" \ - "2B | Speedtest CLI" "A tool to measure your internet bandwidth" \ "2C | Mail Transfer Agent" "Install Exim4 as MTA to relay mails via public services" \ 3>&1 1>&2 2>&3) if [ $? -eq 1 ] || [ $? -eq 255 ]; then return 0; fi @@ -98,7 +97,6 @@ show_main_menu() { 28\ *) 1wire_setup ;; 29\ *) find_setup ;; 2A\ *) tellstick_core_setup ;; - 2B\ *) speedtest_cli_setup ;; 2C\ *) exim_setup ;; "") return 0 ;; *) whiptail --msgbox "A not supported option was selected (probably a programming error):\\n \"$choice2\"" 8 80 ;; diff --git a/functions/packages.bash b/functions/packages.bash index a2d031e07..82780b7a2 100644 --- a/functions/packages.bash +++ b/functions/packages.bash @@ -391,7 +391,7 @@ and activate one of these most common options (depending on your device): miflora_setup() { FAILED=0 DIRECTORY="/opt/miflora-mqtt-daemon" - introtext="This will install or update miflora-mqtt-daemon - The Xiaomi Mi Flora Plant Sensor MQTT Client/Daemon. See for further details:\n\n https://github.com/ThomDietrich/miflora-mqtt-daemon" + introtext="[CURRENTLY BROKEN] This will install or update miflora-mqtt-daemon - The Xiaomi Mi Flora Plant Sensor MQTT Client/Daemon. See for further details:\n\n https://github.com/ThomDietrich/miflora-mqtt-daemon" failtext="Sadly there was a problem setting up the selected option. Please report this problem in the openHAB community forum or as a openHABian GitHub issue." successtext="Setup was successful. The Daemon was installed and the systemd service was set up just as described in it's README. Please add your MQTT broker settings in '$DIRECTORY/config.ini' and add your Mi Flora sensors. After that be sure to restart the daemon to reload it's configuration. @@ -439,30 +439,6 @@ The article also contains instructions regarding openHAB integration. fi } -speedtest_cli_setup() { - FAILED=0 - introtext="This will install the Speedtest CLI tool. For integration with openHAB, please follow the instructions found here: - \nhttps://community.openhab.org/t/7611/1 \nSoon this procedure will set up the connection between it and openHAB automatically." - failtext="Sadly there was a problem setting up the selected option. Please report this problem in the openHAB community forum or as a openHABian GitHub issue." - successtext="Setup successful. Please continue with the instructions you can find here:\n\nhttps://community.openhab.org/t/7611/1" - - echo -n "$(timestamp) [openHABian] Setting up Speedtest CLI... " - - cond_redirect apt-get update - cond_redirect apt-get -y install python-setuptools - if [ $? -ne 0 ]; then echo "FAILED (prerequisites)"; exit 1; fi - cond_redirect easy_install speedtest-cli - if [ $? -eq 0 ]; then echo "OK"; else echo "FAILED"; exit 1; fi - - if [ -n "$INTERACTIVE" ]; then - if [ $FAILED -eq 0 ]; then - whiptail --title "Operation Successful!" --msgbox "$successtext" 15 80 - else - whiptail --title "Operation Failed!" --msgbox "$failtext" 10 60 - fi - fi -} - nginx_setup() { introtext="This will enable you to access the openHAB interface through the normal HTTP/HTTPS ports and optionally secure it with username/password and/or an SSL certificate." failtext="Sadly there was a problem setting up the selected option. Please report this problem in the openHAB community forum or as a openHABian GitHub issue." @@ -644,7 +620,7 @@ nginx_setup() { tellstick_core_setup() { FAILED=0 - introtext="This will install tellstick core services to enable support for USB connected Tellstick and Tellstick duo. For more details, have a look at http://developer.telldus.se/" + introtext="[CURRENTLY BROKEN] This will install tellstick core services to enable support for USB connected Tellstick and Tellstick duo. For more details, have a look at http://developer.telldus.se/" failtext="Sadly there was a problem setting up tellstick core. Please report this problem in the openHAB community forum or as a openHABian GitHub issue." successtext="Success, please reboot your system to complete the installation.