From c7b7a2422d60cf512fd557108b43a9c5dfcb2418 Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Wed, 14 Nov 2018 01:08:14 +0000 Subject: [PATCH] improved speed of get-packages Former-commit-id: 0032bbeb215e8c4dd92f9f5b36ca7f777ca82fb5 --- get-peasoup-packages.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/get-peasoup-packages.sh b/get-peasoup-packages.sh index 93a85e1ed..b9acaeff3 100755 --- a/get-peasoup-packages.sh +++ b/get-peasoup-packages.sh @@ -40,8 +40,6 @@ CLIENT_IRDB_PKGS=" pgadmin3 apt-libpqxx-dev yum-libpqxx-devel - apt-libmysqlclient-dev - yum-libmysqlclient-devel scons cmake automake1.9" @@ -61,22 +59,28 @@ install_packs() which apt-get 1> /dev/null 2> /dev/null if [[ $? == 0 ]]; then if [[ $i =~ apt-* ]]; then - sudo apt-get -y install $(echo $i|sed "s/^apt-//") + apters="$apters $(echo $i|sed "s/^apt-//")" elif [[ $i =~ yum-* ]]; then echo "Skipping install of $i for platform $(lsb_release -d -s)" else - sudo apt-get -y install $i + apters="$apters $i" fi else if [[ $i =~ apt-* ]]; then echo "Skipping install of $i for platform $(cat /etc/redhat-release)" elif [[ $i =~ yum-* ]]; then - sudo yum -y install $(echo $i|sed "s/^yum-//") + yummers="$yummers $(echo $i|sed "s/^yum-//")" else - sudo yum -y install $i + yummers="$yummers $i" fi fi done + which apt-get 1> /dev/null 2> /dev/null + if [[ $? == 0 ]]; then + sudo apt-get install -y --ignore-missing $apters + else + sudo yum install -y --skip-broken $yummers + fi } args="$@" -- GitLab