Skip to content

Commit

Permalink
quiet apt-get in builds
Browse files Browse the repository at this point in the history
  • Loading branch information
dzuelke committed Feb 11, 2017
1 parent fd65b57 commit 33eac18
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ echo "-----> Building ${dep_package} (from PECL)..."
# we need libgmp-dev
needed=( libgmp-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ -n "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
if [[ "$missing" ]]; then
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi

curl -L ${dep_url} | tar xz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ else
needed=( libmemcached-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi
fi

# we need libsasl2-dev for ext-memcached
needed=( libsasl2-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi

curl -L ${dep_url} | tar xz
Expand Down
6 changes: 3 additions & 3 deletions support/build/libraries/libc-client
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ echo "-----> Building ${dep_package}..."
# we need that for IMAP
needed=( libpam0g-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ -n "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
if [[ "$missing" ]]; then
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi

curl -L ${dep_url} | tar xz
Expand Down
6 changes: 3 additions & 3 deletions support/build/libraries/libcassandra
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ dep_manifest=${dep_package}.composer.json
# we need libgmp-dev and cmake
needed=( libgmp-dev cmake )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ -n "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
if [[ "$missing" ]]; then
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi

echo "-----> Building ${dep_package}..."
Expand Down
4 changes: 2 additions & 2 deletions support/build/libraries/libmemcached
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ if [[ "$missing" ]]; then
needed=( libsasl2-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi
echo "-----> Building ${dep_package}..."

Expand Down
6 changes: 3 additions & 3 deletions support/build/libraries/librdkafka
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ dep_manifest=${dep_package}.composer.json
# we need libsasl2-dev
needed=( libsasl2-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ -n "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
if [[ "$missing" ]]; then
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi

echo "-----> Building ${dep_package}..."
Expand Down
8 changes: 4 additions & 4 deletions support/build/php
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ fi
needed=( libgmp-dev libpam0g-dev libicu-dev libsasl2-dev libkrb5-dev libldap2-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi

# look for GMP libs in /usr/lib/x86_64-linux-gnu and not /usr/lib
Expand All @@ -80,8 +80,8 @@ else
needed=( libmcrypt-dev )
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
if [[ "$missing" ]]; then
apt-get update || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -y $missing
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
apt-get install -q -y $missing
fi
fi

Expand Down

0 comments on commit 33eac18

Please sign in to comment.