diff options
author | Joshua Colp <jcolp@digium.com> | 2016-04-04 18:21:02 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-04-04 18:21:02 -0500 |
commit | 5de637df4d1f37de8e37a2279238a322cc2b9cf4 (patch) | |
tree | d7d98b890e567057c613346805fe3ecddf37dfe9 | |
parent | 3c91a76a3b39248816bcb4f31c16153332a92c97 (diff) | |
parent | 9d4318f79852b4318a5204495335fd971b20cab0 (diff) |
Merge "install_prereq: Fix check_installed_debs remove subversion" into 13
-rwxr-xr-x | contrib/scripts/install_prereq | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq index afad1f719..1682558ac 100755 --- a/contrib/scripts/install_prereq +++ b/contrib/scripts/install_prereq @@ -66,13 +66,12 @@ in_test_mode() { } check_installed_debs() { - for pack in "$@" - do - tocheck="${tocheck} ^${pack}$" + for pack in "$@" ; do + tocheck="${tocheck} ^${pack}$ ~P^${pack}$" done pkgs=$(aptitude -F '%c %p' search ${tocheck} 2>/dev/null | awk '/^p/{print $2}') - if ! [ ${#pkgs} -eq 0 ]; then - echo $pkgs | grep -v ':i386$' + if [ ${#pkgs} -ne 0 ]; then + echo $pkgs | sed -r -e "s/ ?[^ :]+:i386//g" fi } |