From f6d13622422fc49c732cd78ca1886240f6453734 Mon Sep 17 00:00:00 2001 From: Mafoo Date: Fri, 25 Nov 2016 17:06:21 +0000 Subject: [PATCH] BugFix-Newlines (#50) this should fix - https://github.com/fusionpbx/fusionpbx-install.sh/issues/48 --- debian/resources/finish.sh | 54 +++++++++--------- debian/resources/switch/package-master-all.sh | 18 +++--- debian/resources/switch/package-master.sh | 56 +++++++++---------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/debian/resources/finish.sh b/debian/resources/finish.sh index 0243778..bfadec2 100755 --- a/debian/resources/finish.sh +++ b/debian/resources/finish.sh @@ -1,27 +1,27 @@ -#!/bin/bash -echo "Waiting for config.php to exist." -seconds=0 -while [ ! -f /tmp/test.txt ] && [ ! -f /tmp/test2.txt ] -do - echo -ne "$seconds\033[o\r" - sleep 1 - seconds=$((seconds+1)) -done - -if [ -f /tmp/test.txt ] || [ -f /tmp/test2.txt ] -then - echo "The config.php has been found." -fi - -echo "Waiting 30 more seconds before continuing." -seconds=0 -while [ $seconds -lt 30 ] -do - echo -ne "$seconds\033[o\r" - sleep 1 - seconds=$((seconds+1)) -done - -#restart freeswitch -/bin/systemctl daemon-reload -/bin/systemctl restart freeswitch +#!/bin/bash +echo "Waiting for config.php to exist." +seconds=0 +while [ ! -f /tmp/test.txt ] && [ ! -f /tmp/test2.txt ] +do + echo -ne "$seconds\033[o\r" + sleep 1 + seconds=$((seconds+1)) +done + +if [ -f /tmp/test.txt ] || [ -f /tmp/test2.txt ] +then + echo "The config.php has been found." +fi + +echo "Waiting 30 more seconds before continuing." +seconds=0 +while [ $seconds -lt 30 ] +do + echo -ne "$seconds\033[o\r" + sleep 1 + seconds=$((seconds+1)) +done + +#restart freeswitch +/bin/systemctl daemon-reload +/bin/systemctl restart freeswitch diff --git a/debian/resources/switch/package-master-all.sh b/debian/resources/switch/package-master-all.sh index 5bd4cd8..667bfff 100755 --- a/debian/resources/switch/package-master-all.sh +++ b/debian/resources/switch/package-master-all.sh @@ -1,9 +1,9 @@ -#!/bin/sh -apt-get update && apt-get install -y --force-yes ntp curl memcached haveged -curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - -echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list -echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" >> /etc/apt/sources.list.d/freeswitch.list -apt-get update && apt-get install -y --force-yes freeswitch-meta-all freeswitch-all-dbg gdb - -#make sure that postgresql is started before starting freeswitch -sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' +#!/bin/sh +apt-get update && apt-get install -y --force-yes ntp curl memcached haveged +curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - +echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list +echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" >> /etc/apt/sources.list.d/freeswitch.list +apt-get update && apt-get install -y --force-yes freeswitch-meta-all freeswitch-all-dbg gdb + +#make sure that postgresql is started before starting freeswitch +sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' diff --git a/debian/resources/switch/package-master.sh b/debian/resources/switch/package-master.sh index f5aaea0..45efd54 100755 --- a/debian/resources/switch/package-master.sh +++ b/debian/resources/switch/package-master.sh @@ -1,28 +1,28 @@ -#!/bin/sh -apt-get update && apt-get install -y --force-yes curl memcached haveged -curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - -echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list -echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" >> /etc/apt/sources.list.d/freeswitch.list -apt-get update -apt-get install -y --force-yes ntp gdb -apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor -apt-get install -y --force-yes freeswitch-lang-en freeswitch-mod-say-en freeswitch-sounds-en-us-callie -apt-get install -y --force-yes freeswitch-mod-enum freeswitch-mod-cdr-csv freeswitch-mod-event-socket freeswitch-mod-sofia freeswitch-mod-sofia-dbg freeswitch-mod-loopback -apt-get install -y --force-yes freeswitch-mod-conference freeswitch-mod-db freeswitch-mod-dptools freeswitch-mod-expr freeswitch-mod-fifo libyuv-dev freeswitch-mod-httapi -apt-get install -y --force-yes freeswitch-mod-hash freeswitch-mod-esl freeswitch-mod-esf freeswitch-mod-fsv freeswitch-mod-valet-parking freeswitch-mod-dialplan-xml freeswitch-dbg -apt-get install -y --force-yes freeswitch-mod-sndfile freeswitch-mod-native-file freeswitch-mod-local-stream freeswitch-mod-tone-stream freeswitch-mod-lua freeswitch-meta-mod-say -apt-get install -y --force-yes freeswitch-mod-xml-cdr freeswitch-mod-verto freeswitch-mod-callcenter freeswitch-mod-rtc freeswitch-mod-png freeswitch-mod-json-cdr freeswitch-mod-shout -apt-get install -y --force-yes freeswitch-mod-skypopen freeswitch-mod-skypopen-dbg freeswitch-mod-sms freeswitch-mod-sms-dbg freeswitch-mod-cidlookup freeswitch-mod-memcache -apt-get install -y --force-yes freeswitch-mod-imagick freeswitch-mod-tts-commandline freeswitch-mod-directory freeswitch-mod-flite -apt-get install -y --force-yes freeswitch-music-default - -#make sure that postgresql is started before starting freeswitch -sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' - -#remove the music package to protect music on hold from package updates -mkdir -p /usr/share/freeswitch/sounds/temp -mv /usr/share/freeswitch/sounds/music/*000 /usr/share/freeswitch/sounds/temp -apt-get remove -y --force-yes freeswitch-music-default -mkdir -p /usr/share/freeswitch/sounds/music/default -mv /usr/share/freeswitch/sounds/temp/* /usr/share/freeswitch/sounds/music/default -rm -R /usr/share/freeswitch/sounds/temp +#!/bin/sh +apt-get update && apt-get install -y --force-yes curl memcached haveged +curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - +echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list +echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" >> /etc/apt/sources.list.d/freeswitch.list +apt-get update +apt-get install -y --force-yes ntp gdb +apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor +apt-get install -y --force-yes freeswitch-lang-en freeswitch-mod-say-en freeswitch-sounds-en-us-callie +apt-get install -y --force-yes freeswitch-mod-enum freeswitch-mod-cdr-csv freeswitch-mod-event-socket freeswitch-mod-sofia freeswitch-mod-sofia-dbg freeswitch-mod-loopback +apt-get install -y --force-yes freeswitch-mod-conference freeswitch-mod-db freeswitch-mod-dptools freeswitch-mod-expr freeswitch-mod-fifo libyuv-dev freeswitch-mod-httapi +apt-get install -y --force-yes freeswitch-mod-hash freeswitch-mod-esl freeswitch-mod-esf freeswitch-mod-fsv freeswitch-mod-valet-parking freeswitch-mod-dialplan-xml freeswitch-dbg +apt-get install -y --force-yes freeswitch-mod-sndfile freeswitch-mod-native-file freeswitch-mod-local-stream freeswitch-mod-tone-stream freeswitch-mod-lua freeswitch-meta-mod-say +apt-get install -y --force-yes freeswitch-mod-xml-cdr freeswitch-mod-verto freeswitch-mod-callcenter freeswitch-mod-rtc freeswitch-mod-png freeswitch-mod-json-cdr freeswitch-mod-shout +apt-get install -y --force-yes freeswitch-mod-skypopen freeswitch-mod-skypopen-dbg freeswitch-mod-sms freeswitch-mod-sms-dbg freeswitch-mod-cidlookup freeswitch-mod-memcache +apt-get install -y --force-yes freeswitch-mod-imagick freeswitch-mod-tts-commandline freeswitch-mod-directory freeswitch-mod-flite +apt-get install -y --force-yes freeswitch-music-default + +#make sure that postgresql is started before starting freeswitch +sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' + +#remove the music package to protect music on hold from package updates +mkdir -p /usr/share/freeswitch/sounds/temp +mv /usr/share/freeswitch/sounds/music/*000 /usr/share/freeswitch/sounds/temp +apt-get remove -y --force-yes freeswitch-music-default +mkdir -p /usr/share/freeswitch/sounds/music/default +mv /usr/share/freeswitch/sounds/temp/* /usr/share/freeswitch/sounds/music/default +rm -R /usr/share/freeswitch/sounds/temp