Просмотр исходного кода

fixing a issue with os detection

Richard Neese 12 лет назад
Родитель
Сommit
ec1eccef14
1 измененных файлов с 3 добавлено и 7 удалено
  1. 3 7
      install/Debian/Debian-Wheezy-PBX-PKG-Install-new.sh

+ 3 - 7
install/Debian/Debian-Wheezy-PBX-PKG-Install-new.sh

@@ -197,7 +197,7 @@ if [ ! -s /usr/bin/lsb_release ]; then
 fi
 
 # Os/Distro Check
-lsb_release -c | grep -i wheezy > /dev/null
+lsb_release -c | grep -i wheezy &> /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
 	DISTRO=wheezy
 	echo "Found Debian 7 (wheezy)"
@@ -207,13 +207,14 @@ else
 fi
 
 #adding FusionPBX Web User Interface repo"
-arch | grep -i armv71 > /dev/null
+arch | grep -i armv71 &> /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
 /bin/cat > "/etc/apt/sources.list.d/fusionpbx.list" <<DELIM
 deb http://repo.fusionpbx.com wheezy main
 deb-src http://repo.fusionpbx.com/ wheezy main
 DELIM
 else
+apt-get install curl
 /bin/cat > "/etc/apt/sources.list.d/freeswitch.list" <<DELIM
 deb http://files.freeswitch.org/repo/deb/debian/ wheezy main
 deb-src http://files.freeswitch.org/repo/deb/debian/ wheezy main
@@ -221,11 +222,6 @@ DELIM
 
 #adding key for freeswitch repo
 curl http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add -
-
-/bin/cat > "/etc/apt/sources.list.d/fusionpbx.list" <<DELIM
-deb http://repo.fusionpbx.com wheezy main
-deb-src http://repo.fusionpbx.com/ wheezy main
-DELIM
 fi
 
 #Updating OS and installed pre deps