dbxe
/
fusionpbx-install.sh
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

POSIX sh empty value check compatibility

This commit is contained in:
erxspin 2017-03-10 20:25:29 +06:00
parent 2b8242fd2e
commit df098f8932
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
centos/install.sh
View File

@ -7,23 +7,23 @@ cd "$(dirname "$0")"
. ./resources/colors.sh . ./resources/colors.sh
. ./resources/arguments.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 #check what the CPU and OS are
OS_test=$(uname -m) OS_test=$(uname -m)
CPU_arch='unknown' CPU_arch='unknown'
OS_bits='unknown' OS_bits='unknown'
CPU_bits='unknown' CPU_bits='unknown'
if [ $OS_test = 'armv7l' ]; then if [ .$OS_test = .'armv7l' ]; then
OS_bits='32' OS_bits='32'
CPU_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 # 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' CPU_arch='arm'
elif [ $OS_test = 'armv8l' ]; then elif [ .$OS_test = .'armv8l' ]; then
# We currently have no test case for armv8l # We currently have no test case for armv8l
OS_bits='unknown' OS_bits='unknown'
CPU_bits='64' CPU_bits='64'
CPU_arch='arm' CPU_arch='arm'
elif [ $OS_test = 'i386' ]; then elif [ .$OS_test = .'i386' ]; then
OS_bits='32' OS_bits='32'
if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
CPU_bits='64' CPU_bits='64'
@ -31,7 +31,7 @@ if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then
CPU_bits='32' CPU_bits='32'
fi fi
CPU_arch='x86' CPU_arch='x86'
elif [ $OS_test = 'i686' ]; then elif [ .$OS_test = .'i686' ]; then
OS_bits='32' OS_bits='32'
if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
CPU_bits='64' CPU_bits='64'
@ -39,7 +39,7 @@ if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then
CPU_bits='32' CPU_bits='32'
fi fi
CPU_arch='x86' CPU_arch='x86'
elif [ $OS_test = 'x86_64' ]; then elif [ .$OS_test = .'x86_64' ]; then
OS_bits='64' OS_bits='64'
if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
CPU_bits='64' CPU_bits='64'
@ -49,17 +49,17 @@ if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then
CPU_arch='x86' CPU_arch='x86'
fi fi
if [ $CPU_arch = 'arm' ]; then if [ .$CPU_arch = .'arm' ]; then
error "CentOS on arm is not supported at this time" error "CentOS on arm is not supported at this time"
exit 3 exit 3
elif [ $CPU_arch = 'x86' ]; then elif [ .$CPU_arch = .'x86' ]; then
if [ $OS_bits = '32' ]; then if [ .$OS_bits = .'32' ]; then
error "You are using a 32bit OS this is unsupported" 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" warning " Your CPU is 64bit you should consider reinstalling with a 64bit OS"
fi fi
exit 3 exit 3
elif [ $OS_bits = '64' ]; then elif [ .$OS_bits = .'64' ]; then
verbose "Correct CPU/OS detected" verbose "Correct CPU/OS detected"
else else
error "Unknown OS_bits $OS_bits this is unsupported" error "Unknown OS_bits $OS_bits this is unsupported"

2
centos/resources/arguments.sh
View File

@ -31,7 +31,7 @@ if [ -z "$CPU_CHECK" ]; then
esac esac
done done
if [ $HELP = true ]; then if [ .$HELP = .true ]; then
warning "Debian installer script" warning "Debian installer script"
warning " --use-switch-source will use freeswitch from source rather than ${green}(default:packages)" warning " --use-switch-source will use freeswitch from source rather than ${green}(default:packages)"
warning " --use-switch-package-all if using packages use the meta-all package" warning " --use-switch-package-all if using packages use the meta-all package"

2
centos/resources/fail2ban.sh
View File

@ -24,7 +24,7 @@ cp ./fail2ban/nginx-dos.conf /etc/fail2ban/filter.d/nginx-dos.conf
cp ./fail2ban/jail.local /etc/fail2ban/jail.local cp ./fail2ban/jail.local /etc/fail2ban/jail.local
#update config if source is being used #update config if source is being used
#if [ $USE_FREESWITCH_SOURCE = true ]; then #if [ .$USE_FREESWITCH_SOURCE = .true ]; then
# sed 's#var/log/freeswitch#usr/local/freeswitch/log#g' -i /etc/fail2ban/jail.local # sed 's#var/log/freeswitch#usr/local/freeswitch/log#g' -i /etc/fail2ban/jail.local
#fi #fi

2
centos/resources/fusionpbx.sh
View File

@ -22,7 +22,7 @@ wget https://forensics.cert.org/cert-forensics-tools-release-el7.rpm
rpm -Uvh cert-forensics-tools-release*rpm rpm -Uvh cert-forensics-tools-release*rpm
yum -y --enablerepo=forensics install lame yum -y --enablerepo=forensics install lame
if [ $USE_SYSTEM_MASTER = true ]; then if [ .$USE_SYSTEM_MASTER = .true ]; then
verbose "Using master" verbose "Using master"
BRANCH="" BRANCH=""
else else