From 90458ae6b7495f97d75b7a08c7d4668ac605cf9a Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 23 Oct 2019 11:50:31 +0200 Subject: [PATCH] small fixes --- aarch64/scripts/iobroker_startup.sh | 2 -- aarch64/scripts/setup_avahi.sh | 14 +++++++------- aarch64/scripts/setup_zwave.sh | 6 +++--- amd64/scripts/iobroker_startup.sh | 2 -- amd64/scripts/setup_avahi.sh | 14 +++++++------- amd64/scripts/setup_zwave.sh | 6 +++--- armv7hf/scripts/iobroker_startup.sh | 2 -- armv7hf/scripts/setup_avahi.sh | 14 +++++++------- armv7hf/scripts/setup_zwave.sh | 6 +++--- 9 files changed, 30 insertions(+), 36 deletions(-) diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh index 10328fa..68e9537 100644 --- a/aarch64/scripts/iobroker_startup.sh +++ b/aarch64/scripts/iobroker_startup.sh @@ -145,7 +145,6 @@ echo ' ' if [ "$avahi" = "true" ] then echo "Avahi-daemon is activated by ENV." - echo "Initializing Avahi-Daemon..." chmod 764 /opt/scripts/setup_avahi.sh sh /opt/scripts/setup_avahi.sh echo "Done." @@ -155,7 +154,6 @@ fi if [ "$zwave" = "true" ] then echo "ZWave is activated by ENV." - echo "Initializing ZWave-support..." chmod 764 /opt/scripts/setup_zwave.sh sh /opt/scripts/setup_zwave.sh echo "Done." diff --git a/aarch64/scripts/setup_avahi.sh b/aarch64/scripts/setup_avahi.sh index 469331b..2f64a72 100644 --- a/aarch64/scripts/setup_avahi.sh +++ b/aarch64/scripts/setup_avahi.sh @@ -1,18 +1,18 @@ #!/bin/bash -echo 'Checking avahi-daemon installation state...' +echo "Checking avahi-daemon installation state..." if [ -f /usr/sbin/avahi-daemon ] then - echo 'Avahi already installed...' + echo "Avahi is already installed..." else - echo 'Installing avahi-daemon...' + echo "Avahi-daemon is NOT installed. Going to install it now..." apt-get update > /opt/scripts/avahi_startup.log 2>&1 apt-get install -y libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1 rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1 - echo 'Configuring avahi-daemon...' + echo "Configuring avahi-daemon..." sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf - echo 'Configuring dbus...' + echo "Configuring dbus..." mkdir /var/run/dbus/ fi @@ -26,10 +26,10 @@ then rm -f /var/run/avahi-daemon//pid fi -echo 'Starting dbus...' +echo "Starting dbus..." dbus-daemon --system -echo 'Starting avahi-daemon...' +echo "Starting avahi-daemon..." /etc/init.d/avahi-daemon start exit 0 diff --git a/aarch64/scripts/setup_zwave.sh b/aarch64/scripts/setup_zwave.sh index 488af79..2a76051 100644 --- a/aarch64/scripts/setup_zwave.sh +++ b/aarch64/scripts/setup_zwave.sh @@ -4,6 +4,8 @@ echo "Checking openzwave installation state..." if [ -f /usr/local/lib64 ] then + echo "Openzwave is already installed..." +else echo "Openzwave is NOT installed. Going to install it now..." cd /opt curl -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz @@ -11,9 +13,7 @@ then cd openzwave-1.6.945 && make 2>&1 /dev/null && make install 2>&1 /dev/null ldconfig /usr/local/lib64 cd /opt/iobroker - echo "Openzwave is now installed..." -else - echo "Openzwave is already installed..." + # echo "Openzwave is now installed..." fi exit 0 \ No newline at end of file diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh index 10328fa..68e9537 100644 --- a/amd64/scripts/iobroker_startup.sh +++ b/amd64/scripts/iobroker_startup.sh @@ -145,7 +145,6 @@ echo ' ' if [ "$avahi" = "true" ] then echo "Avahi-daemon is activated by ENV." - echo "Initializing Avahi-Daemon..." chmod 764 /opt/scripts/setup_avahi.sh sh /opt/scripts/setup_avahi.sh echo "Done." @@ -155,7 +154,6 @@ fi if [ "$zwave" = "true" ] then echo "ZWave is activated by ENV." - echo "Initializing ZWave-support..." chmod 764 /opt/scripts/setup_zwave.sh sh /opt/scripts/setup_zwave.sh echo "Done." diff --git a/amd64/scripts/setup_avahi.sh b/amd64/scripts/setup_avahi.sh index 469331b..2f64a72 100644 --- a/amd64/scripts/setup_avahi.sh +++ b/amd64/scripts/setup_avahi.sh @@ -1,18 +1,18 @@ #!/bin/bash -echo 'Checking avahi-daemon installation state...' +echo "Checking avahi-daemon installation state..." if [ -f /usr/sbin/avahi-daemon ] then - echo 'Avahi already installed...' + echo "Avahi is already installed..." else - echo 'Installing avahi-daemon...' + echo "Avahi-daemon is NOT installed. Going to install it now..." apt-get update > /opt/scripts/avahi_startup.log 2>&1 apt-get install -y libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1 rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1 - echo 'Configuring avahi-daemon...' + echo "Configuring avahi-daemon..." sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf - echo 'Configuring dbus...' + echo "Configuring dbus..." mkdir /var/run/dbus/ fi @@ -26,10 +26,10 @@ then rm -f /var/run/avahi-daemon//pid fi -echo 'Starting dbus...' +echo "Starting dbus..." dbus-daemon --system -echo 'Starting avahi-daemon...' +echo "Starting avahi-daemon..." /etc/init.d/avahi-daemon start exit 0 diff --git a/amd64/scripts/setup_zwave.sh b/amd64/scripts/setup_zwave.sh index 488af79..2a76051 100644 --- a/amd64/scripts/setup_zwave.sh +++ b/amd64/scripts/setup_zwave.sh @@ -4,6 +4,8 @@ echo "Checking openzwave installation state..." if [ -f /usr/local/lib64 ] then + echo "Openzwave is already installed..." +else echo "Openzwave is NOT installed. Going to install it now..." cd /opt curl -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz @@ -11,9 +13,7 @@ then cd openzwave-1.6.945 && make 2>&1 /dev/null && make install 2>&1 /dev/null ldconfig /usr/local/lib64 cd /opt/iobroker - echo "Openzwave is now installed..." -else - echo "Openzwave is already installed..." + # echo "Openzwave is now installed..." fi exit 0 \ No newline at end of file diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh index 10328fa..68e9537 100644 --- a/armv7hf/scripts/iobroker_startup.sh +++ b/armv7hf/scripts/iobroker_startup.sh @@ -145,7 +145,6 @@ echo ' ' if [ "$avahi" = "true" ] then echo "Avahi-daemon is activated by ENV." - echo "Initializing Avahi-Daemon..." chmod 764 /opt/scripts/setup_avahi.sh sh /opt/scripts/setup_avahi.sh echo "Done." @@ -155,7 +154,6 @@ fi if [ "$zwave" = "true" ] then echo "ZWave is activated by ENV." - echo "Initializing ZWave-support..." chmod 764 /opt/scripts/setup_zwave.sh sh /opt/scripts/setup_zwave.sh echo "Done." diff --git a/armv7hf/scripts/setup_avahi.sh b/armv7hf/scripts/setup_avahi.sh index 469331b..2f64a72 100644 --- a/armv7hf/scripts/setup_avahi.sh +++ b/armv7hf/scripts/setup_avahi.sh @@ -1,18 +1,18 @@ #!/bin/bash -echo 'Checking avahi-daemon installation state...' +echo "Checking avahi-daemon installation state..." if [ -f /usr/sbin/avahi-daemon ] then - echo 'Avahi already installed...' + echo "Avahi is already installed..." else - echo 'Installing avahi-daemon...' + echo "Avahi-daemon is NOT installed. Going to install it now..." apt-get update > /opt/scripts/avahi_startup.log 2>&1 apt-get install -y libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1 rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1 - echo 'Configuring avahi-daemon...' + echo "Configuring avahi-daemon..." sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf - echo 'Configuring dbus...' + echo "Configuring dbus..." mkdir /var/run/dbus/ fi @@ -26,10 +26,10 @@ then rm -f /var/run/avahi-daemon//pid fi -echo 'Starting dbus...' +echo "Starting dbus..." dbus-daemon --system -echo 'Starting avahi-daemon...' +echo "Starting avahi-daemon..." /etc/init.d/avahi-daemon start exit 0 diff --git a/armv7hf/scripts/setup_zwave.sh b/armv7hf/scripts/setup_zwave.sh index 488af79..2a76051 100644 --- a/armv7hf/scripts/setup_zwave.sh +++ b/armv7hf/scripts/setup_zwave.sh @@ -4,6 +4,8 @@ echo "Checking openzwave installation state..." if [ -f /usr/local/lib64 ] then + echo "Openzwave is already installed..." +else echo "Openzwave is NOT installed. Going to install it now..." cd /opt curl -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz @@ -11,9 +13,7 @@ then cd openzwave-1.6.945 && make 2>&1 /dev/null && make install 2>&1 /dev/null ldconfig /usr/local/lib64 cd /opt/iobroker - echo "Openzwave is now installed..." -else - echo "Openzwave is already installed..." + # echo "Openzwave is now installed..." fi exit 0 \ No newline at end of file