nsinnovations/fusionpbx-install.sh
Public Access
2
0
Fork 0
forked from norman/fusionpbx-install.sh-github-mirror
Code Pull Requests Activity

POSIX sh empty value check compatibility - part 1 (#62)

Browse Source 
# Conflicts:
#	debian/resources/switch/package-all.sh
#	debian/resources/switch/package-release.sh
This commit is contained in:
erxspin
2017-02-24 22:54:19 +06:00
committed by FusionPBX
parent 4c4d0cda55
commit a7b38004ca
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
debian/install.sh vendored
View File

@@ -6,41 +6,41 @@ cd "$(dirname "$0")"
. ./resources/colors.sh
. ./resources/arguments.sh
if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then
if [ .$CPU_CHECK = .true ] && [ .$USE_SWITCH_SOURCE = .false ]; then
#check what the CPU and OS are
OS_test=$(uname -m)
CPU_arch='unknown'
OS_bits='unknown'
CPU_bits='unknown'
if [ $OS_test = 'armv7l' ]; then
if [ .$OS_test = .'armv7l' ]; then
OS_bits='32'
CPU_bits='32'
# RaspberryPi 3 is actually armv8l but current Raspbian reports the cpu as armv7l and no Raspbian 64Bit has been released at this time
CPU_arch='arm'
elif [ $OS_test = 'armv8l' ]; then
elif [ .$OS_test = .'armv8l' ]; then
# We currently have no test case for armv8l
OS_bits='unknown'
CPU_bits='64'
CPU_arch='arm'
elif [ $OS_test = 'i386' ]; then
elif [ .$OS_test = .'i386' ]; then
OS_bits='32'
if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
if [ .$(grep -o -w 'lm' /proc/cpuinfo | head -n 1) = .'lm' ]; then
CPU_bits='64'
else
CPU_bits='32'
fi
CPU_arch='x86'
elif [ $OS_test = 'i686' ]; then
elif [ .$OS_test = .'i686' ]; then
OS_bits='32'
if [ $(grep -o -w 'lm' /proc/cpuinfo) = 'lm' ]; then
if [ .$(grep -o -w 'lm' /proc/cpuinfo | head -n 1) = .'lm' ]; then
CPU_bits='64'
else
CPU_bits='32'
fi
CPU_arch='x86'
elif [ $OS_test = 'x86_64' ]; then
elif [ .$OS_test = .'x86_64' ]; then
OS_bits='64'
if [ $(grep -o -w 'lm' /proc/cpuinfo) = 'lm' ]; then
if [ .$(grep -o -w 'lm' /proc/cpuinfo | head -n 1) = .'lm' ]; then
CPU_bits='64'
else
CPU_bits='32'
@@ -48,11 +48,11 @@ if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then
CPU_arch='x86'
fi
if [ $CPU_arch = 'arm' ]; then
if [ $OS_bits = '32' ]; then
if [ .$CPU_arch = .'arm' ]; then
if [ .$OS_bits = .'32' ]; then
export USE_SWITCH_PACKAGE_UNOFFICIAL_ARM=true
verbose "Correct CPU/OS detected, using unofficial arm repo"
elif [ $OS_bits = '64' ]; then
elif [ .$OS_bits = .'64' ]; then
error "You are using a 64bit arm OS this is unsupported"
warning " please rerun with --use-switch-source"
exit 3
@@ -61,15 +61,15 @@ if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then
warning " please rerun with --use-switch-source"
exit 3
fi
elif [ $CPU_arch = 'x86' ]; then
if [ $OS_bits = '32' ]; then
elif [ .$CPU_arch = .'x86' ]; then
if [ .$OS_bits = .'32' ]; then
error "You are using a 32bit OS this is unsupported"
if [ $CPU_bits = '64' ]; then
if [ .$CPU_bits = .'64' ]; then
warning " Your CPU is 64bit you should consider reinstalling with a 64bit OS"
fi
warning " please rerun with --use-switch-source"
exit 3
elif [ $OS_bits = '64' ]; then
elif [ .$OS_bits = .'64' ]; then
verbose "Correct CPU/OS detected"
else
error "Unknown OS_bits $OS_bits this is unsupported"
@@ -104,8 +104,8 @@ resources/php.sh
resources/fail2ban.sh
#FreeSWITCH
if [ $USE_SWITCH_SOURCE = true ]; then
if [ $USE_SWITCH_MASTER = true ]; then
if [ .$USE_SWITCH_SOURCE = .true ]; then
if [ .$USE_SWITCH_MASTER = .true ]; then
resources/switch/source-master.sh
else
resources/switch/source-release.sh
@@ -121,14 +121,14 @@ if [ $USE_SWITCH_SOURCE = true ]; then
resources/switch/source-systemd.sh
else
if [ $USE_SWITCH_MASTER = true ]; then
if [ $USE_SWITCH_PACKAGE_ALL = true ]; then
if [ .$USE_SWITCH_MASTER = .true ]; then
if [ .$USE_SWITCH_PACKAGE_ALL = .true ]; then
resources/switch/package-master-all.sh
else
resources/switch/package-master.sh
fi
else
if [ $USE_SWITCH_PACKAGE_ALL = true ]; then
if [ .$USE_SWITCH_PACKAGE_ALL = .true ]; then
resources/switch/package-all.sh
else
resources/switch/package-release.sh