Merge pull request #9 from tvdzwan/master

script fixes

Former-commit-id: c2a75ff2208ae3d949ede42e80022559f29a351e
This commit is contained in:
AEtHeLsYn 2016-03-21 08:58:56 +01:00
commit 935f24f4f9
2 changed files with 2 additions and 2 deletions

View File

@ -34,7 +34,7 @@ CPU_WETEK=`grep -m1 -c Amlogic /proc/cpuinfo`
CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l` CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l`
#CPU_X32=`uname -m | grep 'x86_32\|i686' | wc -l` #CPU_X32=`uname -m | grep 'x86_32\|i686' | wc -l`
# Check that we have a known configuration # Check that we have a known configuration
if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X64 -ne 1 ] && [ $CPU_X32 -ne 1 ]; then if [ $CPU_RPI -ne 1 ] && [ $CPU_IMX6 -ne 1 ] && [ $CPU_WETEK -ne 1 ] && [ $CPU_X32X64 -ne 1 ]; then
echo '---> Critical Error: CPU information does not match any known releases -> abort' echo '---> Critical Error: CPU information does not match any known releases -> abort'
exit 1 exit 1
fi fi

View File

@ -64,7 +64,7 @@ fi
#Disabling and delete service files #Disabling and delete service files
if [ $USE_INITCTL -eq 1 ]; then if [ $USE_INITCTL -eq 1 ]; then
echo '---> Delete and disable Hyperion initctl script' echo '---> Delete and disable Hyperion initctl script'
rm -v /etc/init/hyperion 2>/dev/null rm -v /etc/init/hyperion.conf 2>/dev/null
initctl reload-configuration initctl reload-configuration
elif [ $OS_OPENELEC -eq 1 ]; then elif [ $OS_OPENELEC -eq 1 ]; then
# Remove Hyperion from OpenELEC autostart.sh # Remove Hyperion from OpenELEC autostart.sh