From fdbbdd09cc992ca9da8395ca01dc7e7841291bb7 Mon Sep 17 00:00:00 2001 From: brindosch Date: Thu, 5 May 2016 12:55:11 +0200 Subject: [PATCH] prevent spam Former-commit-id: 3848e23575cb73e322652a9d2f2b677c64763f14 --- bin/install_hyperion.sh | 6 +++--- bin/remove_hyperion.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh index 7b7a354d..c0b05212 100755 --- a/bin/install_hyperion.sh +++ b/bin/install_hyperion.sh @@ -98,7 +98,7 @@ fi if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -ne 1 ]; then SPIOK=`grep '^\dtparam=spi=on' /boot/config.txt | wc -l` if [ $SPIOK -ne 1 ]; then - echo '---> Raspberry Pi found, but SPI is not ready, we write "dtparam=spi=on" to /boot/config.txt' + echo '---> Raspberry Pi found, but SPI is not set, we write "dtparam=spi=on" to /boot/config.txt' sed -i '$a dtparam=spi=on' /boot/config.txt if [ $HCInstall -ne 1 ]; then REBOOTMESSAGE="echo Please reboot your Raspberry Pi, we inserted dtparam=spi=on to /boot/config.txt" @@ -111,7 +111,7 @@ if [ $CPU_RPI -eq 1 ] && [ $OS_OPENELEC -eq 1 ]; then SPIOK=`grep '^\dtparam=spi=on' /flash/config.txt | wc -l` if [ $SPIOK -ne 1 ]; then mount -o remount,rw /flash - echo '---> Raspberry Pi with OpenELEC/LibreELEC found, but SPI is not set, we write "dtparam=spi=on" to /flash/config.txt' + echo '---> RPi with OpenELEC/LibreELEC found, but SPI is not set, we write "dtparam=spi=on" to /flash/config.txt' sed -i '$a dtparam=spi=on' /flash/config.txt mount -o remount,ro /flash if [ $HCInstall -ne 1 ]; then @@ -222,7 +222,7 @@ if [ $USE_INITCTL -eq 1 ]; then initctl reload-configuration elif [ $OS_OPENELEC -eq 1 ]; then #modify all old installs with a logfile output - sed -i 's|/dev/null|/storage/logfiles/hyperion.log|g' /storage/.config/autostart.sh + sed -i 's|/dev/null|/storage/logfiles/hyperion.log|g' /storage/.config/autostart.sh 2>/dev/null # only add to start script if hyperion is not present yet mkdir /storage/logfiles 2>/dev/null touch /storage/.config/autostart.sh 2>/dev/null diff --git a/bin/remove_hyperion.sh b/bin/remove_hyperion.sh index a8215c54..c3034032 100644 --- a/bin/remove_hyperion.sh +++ b/bin/remove_hyperion.sh @@ -43,7 +43,7 @@ done echo "---> You entered \"$CONFIRM\". Remove Hyperion!" fi # Find out if we are on OpenElec or RasPlex -OS_OPENELEC=`grep -m1 -c 'OpenELEC\|RasPlex' /etc/issue` +OS_OPENELEC=`grep -m1 -c 'OpenELEC\|RasPlex\|LibreELEC' /etc/issue` # check which init script we should use USE_SYSTEMD=`grep -m1 -c systemd /proc/1/comm`