diff options
| author | Albert Vaca Cintora | 2019-08-23 23:40:40 +0200 |
|---|---|---|
| committer | Albert Vaca Cintora | 2019-08-23 23:41:44 +0200 |
| commit | 37539900a4b2e45d93eadc05101143eda3365da8 (patch) | |
| tree | d9ef827ae04497365a7a78d8f275b3c37ecdddec | |
| parent | d39d1c2474c949c0dc7f84611b282297b1f1c2a5 (diff) | |
| download | aur-37539900a4b2e45d93eadc05101143eda3365da8.tar.gz | |
Fixed prepare when the release was not the last
We were just greping for datadog-agent and keeping the last instance with
tail, which was unreliable. Now we grep for datadog-agent followed by the
exact version string we want, which should give a single match.
Co-authored-by: Mark Nottingham <mnot@mnot.net>
| -rw-r--r-- | PKGBUILD | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -26,11 +26,12 @@ validpgpkeys=('A2923DFF56EDA6E76E55E492D3A80E30382E94DE') # Datadog, Inc <packag prepare() { # Validate hashes from the PGP signed "Release" file - echo "$(grep 6/binary-amd64/Packages ${pkgname}-${pkgver}-${_agentrel}-Release | tail -n 2 | head -n 1 | awk '{print $1}') ${pkgname}-${pkgver}-${_agentrel}-Packages" \ + echo $(grep 6/binary-amd64/Packages ${pkgname}-${pkgver}-${_agentrel}-Release | tail -n 2 | head -n 1 | awk '{print $1}') ${pkgname}-${pkgver}-${_agentrel}-Packages \ > "${pkgname}-${pkgver}-${_agentrel}-Packages.sha256" sha256sum -c "${pkgname}-${pkgver}-${_agentrel}-Packages.sha256" - echo "$(grep datadog-agent -A 20 ${pkgname}-${pkgver}-${_agentrel}-Packages | grep SHA256 | tail -n 1 | awk '{print $2}') datadog-agent_${pkgver}-${_agentrel}_amd64.deb" \ + #Using pcregrep because we need to do a multi-line match + echo $(pcregrep -A 20 -M "datadog-agent\nVersion: 1:${pkgver}-${_agentrel}" ${pkgname}-${pkgver}-${_agentrel}-Packages | grep ^SHA256 | awk '{print $2}') datadog-agent_${pkgver}-${_agentrel}_amd64.deb \ > "${pkgname}-${pkgver}-${_agentrel}.deb.sha256" sha256sum -c "${pkgname}-${pkgver}-${_agentrel}.deb.sha256" } |