From 0c9f991ca0155ccdabb44986180687a62b2903fc Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Mon, 6 Feb 2017 17:58:14 +0000
Subject: [PATCH] Updates to get things to build on ubuntu 16 which is a bit
stricter about a few source language restrictions. should affect anyone else
Former-commit-id: a9d56d7603433398c57c9bcec924d2050862b71e
---
get-peasoup-packages.sh | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/get-peasoup-packages.sh b/get-peasoup-packages.sh
index 50ab11f92..2929ad6da 100755
--- a/get-peasoup-packages.sh
+++ b/get-peasoup-packages.sh
@@ -35,7 +35,7 @@ BASE_PKGS="
CLIENT_IRDB_PKGS="
postgresql-client
pgadmin3
- libpqxx3-dev
+ libpqxx-dev
libmysqlclient-dev
scons
cmake
@@ -73,31 +73,39 @@ if [[ "$PEASOUP_UMBRELLA_DIR" == "" ]]; then
exit 1
fi
+
+install_packs()
+{
+ for i in $*
+ do
+ sudo apt-get install $i -y
+ done
+}
for arg in $@; do
case $arg in
all)
- sudo apt-get install $ALL_PKGS
+ install_packs $ALL_PKGS
;;
base)
- sudo apt-get install $BASE_PKGS
+ install_packs $BASE_PKGS
;;
client-irdb)
- sudo apt-get install $CLIENT_IRDB_PKGS
+ install_packs $CLIENT_IRDB_PKGS
;;
server-irdb)
- sudo apt-get install $SERVER_IRDB_PKGS
+ install_packs $SERVER_IRDB_PKGS
;;
irdb)
- sudo apt-get install $CLIENT_IRDB_PKGS $SERVER_IRDB_PKGS
+ install_packs $CLIENT_IRDB_PKGS $SERVER_IRDB_PKGS
;;
test)
- sudo apt-get install $TEST_PKGS
+ install_packs $TEST_PKGS
;;
- sql)
- sudo apt-get install $SQL_PKGS
+ sql)
+ install_packs $SQL_PKGS
;;
- ldap)
- sudo apt-get install $LDAP_PKGS
+ ldap)
+ install_packs $LDAP_PKGS
;;
*)
echo "$arg not recognized. Recognized args: all, base, client-irdb,";
@@ -107,7 +115,7 @@ done
echo "Getting irdb_transforms packages."
cd irdb_transforms
-sudo get-packages.sh
+sudo ./get-packages.sh
cd $PEASOUP_UMBRELLA_DIR
echo Peasoup packages complete.
--
GitLab