From 788bc60018853ca2aaf3a62eed8bf091be2d2a31 Mon Sep 17 00:00:00 2001 From: jdh8d <jdh8d@git.zephyr-software.com> Date: Sat, 17 Mar 2018 17:19:58 +0000 Subject: [PATCH] Updated to install w/o needing the env. Former-commit-id: 918d43e55422988ace54a4f2ef2b0d19321af254 --- get-peasoup-packages.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/get-peasoup-packages.sh b/get-peasoup-packages.sh index 7ccb2e0ad..70591d172 100755 --- a/get-peasoup-packages.sh +++ b/get-peasoup-packages.sh @@ -6,7 +6,7 @@ #dpkg --add-architecture i386 #sudo apt-get update -# Needed to build PEASOUP components +# Needed to build components BASE_PKGS=" scons dwarfdump @@ -48,13 +48,6 @@ SERVER_IRDB_PKGS="postgresql" ALL_PKGS="$BASE_PKGS $CLIENT_IRDB_PKGS $SERVER_IRDB_PKGS " -if [[ "$PEASOUP_UMBRELLA_DIR" == "" ]]; then - echo "PEASOUP_UMBRELLA_DIR not found" - echo "Did you source set_env_vars and use sudo -E" - exit 1 -fi - - install_packs() { for i in $* @@ -91,9 +84,11 @@ for arg in args; do esac done + +orig_dir=$(pwd) echo "Getting irdb_transforms packages." cd irdb_transforms sudo ./get-packages.sh -cd $PEASOUP_UMBRELLA_DIR +cd $orig_dir -echo Peasoup packages complete. +echo Intsalling packages complete. -- GitLab