From 742af0d96ababb02af8f87c83ceea3e33a068d4f Mon Sep 17 00:00:00 2001 From: Ryan Jarvis Date: Sun, 4 Mar 2018 19:15:25 -0800 Subject: [PATCH 1/2] Fix misspellings. --- README.md | 2 +- docs/appdaemon.md | 2 +- docs/duckdns.md | 2 +- docs/hassbian_config.md | 2 +- docs/homebridge.md | 6 ++-- docs/libcec.md | 4 +-- docs/mariadb.md | 2 +- docs/mosquitto.md | 2 +- docs/mssql.md | 4 +-- docs/postgresql.md | 2 +- docs/razberry.md | 2 +- docs/samba.md | 2 +- docs/tradfri.md | 2 +- docs/webterminal.md | 2 +- make_package.sh | 4 +-- package/opt/hassbian/suites/duckdns.sh | 2 +- .../opt/hassbian/suites/files/mosquitto.conf | 12 +++---- .../hassbian/suites/hassbian-script-dev.sh | 6 ++-- package/opt/hassbian/suites/hassbian.sh | 2 +- .../opt/hassbian/suites/homeassistant-dev.sh | 8 ++--- package/opt/hassbian/suites/homeassistant.sh | 2 +- package/opt/hassbian/suites/homebridge.sh | 34 +++++++++---------- package/opt/hassbian/suites/libcec.sh | 2 +- package/opt/hassbian/suites/mosquitto.sh | 2 +- package/opt/hassbian/suites/mssql.sh | 2 +- package/opt/hassbian/suites/postgresql.sh | 2 +- package/opt/hassbian/suites/tradfri.sh | 4 +-- package/opt/hassbian/suites/webterminal.sh | 6 ++-- package/usr/local/bin/hassbian-config | 2 +- 29 files changed, 63 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 2d0ee75c..806a8401 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The following scripts are currently included. You can view the documentation bel *** ## Raspbian Jessie -If this package is used with a Debian Jessie based distrbution then you need to uncomment the source repositores in `/etc/apt/sources.list` +If this package is used with a Debian Jessie based distribution then you need to uncomment the source repositories in `/etc/apt/sources.list` ```text # Uncomment line below then 'apt-get update' to enable 'apt-get source' diff --git a/docs/appdaemon.md b/docs/appdaemon.md index 3ee9cd27..64aa3386 100644 --- a/docs/appdaemon.md +++ b/docs/appdaemon.md @@ -26,7 +26,7 @@ $ source /srv/appdaemon/bin/activate ``` When you are done, type `exit` to return to the `pi` user. -To manually start AppDaemon, enter the AppDaemon virtual environment as described abowe, and then type this to start it: +To manually start AppDaemon, enter the AppDaemon virtual environment as described above, and then type this to start it: ```bash $ appdaemon -c /home/homeassistant/appdaemon/ ``` diff --git a/docs/duckdns.md b/docs/duckdns.md index 5a00a32e..8c812a3f 100644 --- a/docs/duckdns.md +++ b/docs/duckdns.md @@ -10,7 +10,7 @@ $ sudo hassbian-config install duckdns ## Additional info Running as: `homeassistant` -If you choose to aslo generate SSL certificates with this you would need to add this under `http:` to your `configuration.yaml` +If you choose to also generate SSL certificates with this you would need to add this under `http:` to your `configuration.yaml` ``` ssl_certificate: /home/homeassistant/dehydrated/certs/YOURDOMAIN.duckdns.org/fullchain.pem ssl_key: /home/homeassistant/dehydrated/certs/YOURDOMAIN.duckdns.org/privkey.pem diff --git a/docs/hassbian_config.md b/docs/hassbian_config.md index cb54bdbd..042a27f6 100644 --- a/docs/hassbian_config.md +++ b/docs/hassbian_config.md @@ -17,7 +17,7 @@ Optional flags: - `-y | --accept` This will accept defaults on scripts that allow this. - `-f | --force` This will force run an script. This is useful if you need to reinstall a package. -Other available comands: +Other available commands: - `-V | --version` This will show you the installed version of `hassbian-config`. - `-H | --help` Shows help for the tool, with all available commands. diff --git a/docs/homebridge.md b/docs/homebridge.md index 1af8bb8b..1e2b52e7 100644 --- a/docs/homebridge.md +++ b/docs/homebridge.md @@ -1,10 +1,10 @@ ## Description This script will install and configure Homebridge to be used with Home Assistant. -This will allow you to controll your home with Apple's HomeKit (Siri on iOS, OSX and AppleTV). +This will allow you to control your home with Apple's HomeKit (Siri on iOS, OSX and AppleTV). By default all devices are hidden, and you will need to add som entries in your `customize.yaml` configuration. You can learn more about this in the [Home Assistant for Homebridge repo.](https://github.com/home-assistant/homebridge-homeassistant#customization) -_NB!: This install script will fail resulting in your Pi to reboot, if you do not use an recomended level powersupply._ +_NB!: This install script will fail resulting in your Pi to reboot, if you do not use an recommended level power supply._ ## Installation ``` @@ -12,7 +12,7 @@ $ sudo hassbian-config install homebridge ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/libcec.md b/docs/libcec.md index 04102c21..ca1cba0a 100644 --- a/docs/libcec.md +++ b/docs/libcec.md @@ -1,5 +1,5 @@ ## Description -**This scipt is currently brooken upstream since it currently doesn't build properly for Python >3.4** +**This script is currently broken upstream since it currently doesn't build properly for Python >3.4** This script installs libcec and it dependencies. Further more this script symlinks the system wide packages to the Home Assistant venv so they can be used with Home Assistant. ## Installation @@ -8,7 +8,7 @@ $ sudo hassbian-config install libcec ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/mariadb.md b/docs/mariadb.md index 3e1a8dd8..4c0eee18 100644 --- a/docs/mariadb.md +++ b/docs/mariadb.md @@ -7,7 +7,7 @@ $ sudo hassbian-config install mariadb ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/mosquitto.md b/docs/mosquitto.md index cd9488c9..2cd1d6e0 100644 --- a/docs/mosquitto.md +++ b/docs/mosquitto.md @@ -7,7 +7,7 @@ $ sudo hassbian-config install mosquitto ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/mssql.md b/docs/mssql.md index e9202d0c..4fe94a81 100644 --- a/docs/mssql.md +++ b/docs/mssql.md @@ -1,5 +1,5 @@ ## Description -This script installs the tools needed to connect to a MS SQL databse and it's dependencies for use with the recorder component in Home Assistant. No database or database user is created during this setup and will need to be created manually. +This script installs the tools needed to connect to a MS SQL database and it's dependencies for use with the recorder component in Home Assistant. No database or database user is created during this setup and will need to be created manually. ## Installation ``` @@ -7,7 +7,7 @@ $ sudo hassbian-config install mssql ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/postgresql.md b/docs/postgresql.md index 667bbe33..53445d76 100644 --- a/docs/postgresql.md +++ b/docs/postgresql.md @@ -7,7 +7,7 @@ $ sudo hassbian-config install postgresql ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/razberry.md b/docs/razberry.md index 503b1a76..fe1921aa 100644 --- a/docs/razberry.md +++ b/docs/razberry.md @@ -7,7 +7,7 @@ $ sudo hassbian-config install razberry ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/samba.md b/docs/samba.md index 7ef70407..2a4d187f 100644 --- a/docs/samba.md +++ b/docs/samba.md @@ -7,7 +7,7 @@ $ sudo hassbian-config install samba ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/tradfri.md b/docs/tradfri.md index 6b09342f..887805a8 100644 --- a/docs/tradfri.md +++ b/docs/tradfri.md @@ -7,7 +7,7 @@ $ sudo hassbian-config install tradfri ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/docs/webterminal.md b/docs/webterminal.md index 3b9d016a..f510d20d 100644 --- a/docs/webterminal.md +++ b/docs/webterminal.md @@ -7,7 +7,7 @@ $ sudo hassbian-config install webterminal ``` ## Upgrade -No script avaiable, maybe you could write one? +No script available, maybe you could write one? If so, add an PR here when you are done: [homeassistant/hassbian-scripts](https://github.com/home-assistant/hassbian-scripts/pulls) diff --git a/make_package.sh b/make_package.sh index 6549ac97..eedb03a8 100755 --- a/make_package.sh +++ b/make_package.sh @@ -6,8 +6,8 @@ PACKAGE=$(grep package -i package/DEBIAN/control | cut -d ":" -f2 | tr -d [:spa PACKAGENAME="${PACKAGE}_${VERSION}.deb" if [ -f $PACKAGENAME ]; then - echo "Previous package exists. Deleting" - rm $PACKAGENAME + echo "Previous package exists. Deleting" + rm $PACKAGENAME fi echo "Building package $PACKAGE version $VERSION" diff --git a/package/opt/hassbian/suites/duckdns.sh b/package/opt/hassbian/suites/duckdns.sh index a27c7e7f..ee0ca278 100644 --- a/package/opt/hassbian/suites/duckdns.sh +++ b/package/opt/hassbian/suites/duckdns.sh @@ -4,7 +4,7 @@ function duckdns-show-short-info { } function duckdns-show-long-info { - echo "This script adds an cron job to auto uppdate you the WAN IP address for the defined domain." + echo "This script adds an cron job to auto update you the WAN IP address for the defined domain." echo "This script can also generate SSL certificate for https with Let’s Encrypt." } diff --git a/package/opt/hassbian/suites/files/mosquitto.conf b/package/opt/hassbian/suites/files/mosquitto.conf index 9dfa2223..d2a2939a 100644 --- a/package/opt/hassbian/suites/files/mosquitto.conf +++ b/package/opt/hassbian/suites/files/mosquitto.conf @@ -221,7 +221,7 @@ protocol websockets #crlfile # If you wish to control which encryption ciphers are used, use the ciphers -# option. The list of available ciphers can be optained using the "openssl +# option. The list of available ciphers can be obtained using the "openssl # ciphers" command and should be provided in the same format as the output of # that command. # If unset defaults to DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2:@STRENGTH @@ -254,7 +254,7 @@ protocol websockets # When using PSK, the encryption ciphers used will be chosen from the list of # available PSK ciphers. If you want to control which ciphers are available, -# use the "ciphers" option. The list of available ciphers can be optained +# use the "ciphers" option. The list of available ciphers can be obtained # using the "openssl ciphers" command and should be provided in the same format # as the output of that command. #ciphers @@ -360,7 +360,7 @@ protocol websockets #crlfile # If you wish to control which encryption ciphers are used, use the ciphers -# option. The list of available ciphers can be optained using the "openssl +# option. The list of available ciphers can be obtained using the "openssl # ciphers" command and should be provided in the same format as the output of # that command. #ciphers @@ -392,7 +392,7 @@ protocol websockets # When using PSK, the encryption ciphers used will be chosen from the list of # available PSK ciphers. If you want to control which ciphers are available, -# use the "ciphers" option. The list of available ciphers can be optained +# use the "ciphers" option. The list of available ciphers can be obtained # using the "openssl ciphers" command and should be provided in the same format # as the output of that command. #ciphers @@ -450,7 +450,7 @@ persistence_location /var/lib/mosquitto/ # where severity is one of D, E, W, N, I, M which are debug, error, # warning, notice, information and message. Message type severity is used by # the subscribe/unsubscribe log_types and publishes log messages to -# $SYS/broker/log/M/susbcribe or $SYS/broker/log/M/unsubscribe. +# $SYS/broker/log/M/subscribe or $SYS/broker/log/M/unsubscribe. # # The file destination requires an additional parameter which is the file to be # logged to, e.g. "log_dest file /var/log/mosquitto.log". The file will be @@ -569,7 +569,7 @@ password_file /etc/mosquitto/pwfile # # # If is also possible to define ACLs based on pattern substitution within the -# topic. The patterns available for substition are: +# topic. The patterns available for substitution are: # # %c to match the client id of the client # %u to match the username of the client diff --git a/package/opt/hassbian/suites/hassbian-script-dev.sh b/package/opt/hassbian/suites/hassbian-script-dev.sh index 374cb5fd..e925f9b5 100644 --- a/package/opt/hassbian/suites/hassbian-script-dev.sh +++ b/package/opt/hassbian/suites/hassbian-script-dev.sh @@ -1,16 +1,16 @@ #!/bin/bash function hassbian-script-dev-show-short-info { - echo "Uppdates scripts from the dev branch." + echo "Updates scripts from the dev branch." } function hassbian-script-dev-show-long-info { echo "This scripts downloads new scripts directly from the dev branch on github." echo "you can use this to be on the 'bleeding edge of the development of Hassbian.'" - echo "This is not recomended for daily use." + echo "This is not recommended for daily use." } function hassbian-script-dev-show-copyright-info { - echo "Original concept by Ludeeus " + echo "Original concept by Ludeeus " } function hassbian-script-dev-upgrade-package { diff --git a/package/opt/hassbian/suites/hassbian.sh b/package/opt/hassbian/suites/hassbian.sh index f7867b9a..7fb131bd 100644 --- a/package/opt/hassbian/suites/hassbian.sh +++ b/package/opt/hassbian/suites/hassbian.sh @@ -9,7 +9,7 @@ function hassbian-show-long-info { function hassbian-show-copyright-info { echo "Original concept by Ludeeus ." - echo "Modyfied by Landrash ." + echo "Modified by Landrash ." } function hassbian-upgrade-package { diff --git a/package/opt/hassbian/suites/homeassistant-dev.sh b/package/opt/hassbian/suites/homeassistant-dev.sh index 96fbef28..95bba5d5 100644 --- a/package/opt/hassbian/suites/homeassistant-dev.sh +++ b/package/opt/hassbian/suites/homeassistant-dev.sh @@ -1,10 +1,10 @@ #!/bin/bash function homeassistant-dev-show-short-info { - echo "Home Assistant developement branch install script for Hassbian." + echo "Home Assistant development branch install script for Hassbian." } function homeassistant-dev-show-long-info { - echo "Installs Home Assistant from the developement branch from github onto this system." + echo "Installs Home Assistant from the development branch from github onto this system." } function homeassistant-dev-show-copyright-info { @@ -15,7 +15,7 @@ function homeassistant-dev-install-package { homeassistant-dev-show-short-info homeassistant-dev-show-copyright-info -echo "Stoping Home Assistant" +echo "Stopping Home Assistant" systemctl stop home-assistant@homeassistant.service sync @@ -49,7 +49,7 @@ validation=$(pgrep -x hass) if [ ! -z "${validation}" ]; then echo echo -e "\\e[32mInstallation done..\\e[0m" - echo "Your Home Assistant development branch installation is running at $ip_address:8123 or if prefered http://hassbian.local:8123" + echo "Your Home Assistant development branch installation is running at $ip_address:8123 or if preferred http://hassbian.local:8123" echo else echo diff --git a/package/opt/hassbian/suites/homeassistant.sh b/package/opt/hassbian/suites/homeassistant.sh index 18d723a0..9867febf 100644 --- a/package/opt/hassbian/suites/homeassistant.sh +++ b/package/opt/hassbian/suites/homeassistant.sh @@ -50,7 +50,7 @@ validation=$(pgrep -x hass) if [ ! -z "${validation}" ]; then echo echo -e "\\e[32mInstallation done..\\e[0m" - echo "Your Home Assistant installation is running at $ip_address:8123 or if prefered http://hassbian.local:8123" + echo "Your Home Assistant installation is running at $ip_address:8123 or if preferred http://hassbian.local:8123" echo "To continue have a look at https://home-assistant.io/getting-started/configuration/" echo echo diff --git a/package/opt/hassbian/suites/homebridge.sh b/package/opt/hassbian/suites/homebridge.sh index 38ecb807..ffb76445 100644 --- a/package/opt/hassbian/suites/homebridge.sh +++ b/package/opt/hassbian/suites/homebridge.sh @@ -5,12 +5,12 @@ function homebridge-show-short-info { function homebridge-show-long-info { echo "Installs and configure Homebridge for Home Assistant" - echo "This will allow you to use HomeKit enabled devices to control Home Assistant." + echo "This will allow you to use HomeKit enabled devices to control Home Assistant." } function homebridge-show-copyright-info { - echo "Original concept by Ludeeus " - echo "Disclaimer: Some parts of this script is inspired by Dale Higgs " + echo "Original concept by Ludeeus " + echo "Disclaimer: Some parts of this script is inspired by Dale Higgs " } function homebridge-install-package { @@ -80,7 +80,7 @@ cat > /home/homebridge/.homebridge/config.json <" + echo "Original concept by Ludeeus " } function webterminal-install-package { diff --git a/package/usr/local/bin/hassbian-config b/package/usr/local/bin/hassbian-config index 363a48c8..c5485cb7 100755 --- a/package/usr/local/bin/hassbian-config +++ b/package/usr/local/bin/hassbian-config @@ -84,7 +84,7 @@ function share-log { a=$(cat $LOGFILE); curl -X POST -s -d "$a" https://hastebin.com/documents | awk -F '"' '{print "https://hastebin.com/"$4}' else echo "This will put the output from your last operation on hastebin." - echo "This could include sensitive informastion." + echo "This could include sensitive information." echo "If you are unsure about what it contains, you can run 'hassbian-config log' to check." echo -n "Do you want to create an hastebin link? [N/y] : " read -r RESPONSE From e7eaf1de33dedd88fd45a1d013ad180a730408fc Mon Sep 17 00:00:00 2001 From: Ryan Jarvis Date: Sun, 4 Mar 2018 19:19:18 -0800 Subject: [PATCH 2/2] Double quote to prevent globbing and word splitting. --- make_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make_package.sh b/make_package.sh index eedb03a8..28a1da12 100755 --- a/make_package.sh +++ b/make_package.sh @@ -7,7 +7,7 @@ PACKAGENAME="${PACKAGE}_${VERSION}.deb" if [ -f $PACKAGENAME ]; then echo "Previous package exists. Deleting" - rm $PACKAGENAME + rm "$PACKAGENAME" fi echo "Building package $PACKAGE version $VERSION"