diff options
| author | Troy Engel | 2017-04-09 07:46:43 -0500 |
|---|---|---|
| committer | Troy Engel | 2017-04-09 07:46:43 -0500 |
| commit | 6b19040826d9dea6e0e887b08abf017612790f9c (patch) | |
| tree | 110f4d2858fff597e8f5ccf327a0c14c98ff5664 | |
| parent | 8385cc482ec438dc7f99994940804b4fae5e4e6a (diff) | |
| download | aur-6b19040826d9dea6e0e887b08abf017612790f9c.tar.gz | |
fix grep to ignore binaries, move kubectl-bin to provides
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 |
2 files changed, 7 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Apr 6 23:47:11 UTC 2017 +# Sun Apr 9 12:45:32 UTC 2017 pkgbase = google-cloud-sdk pkgdesc = Tools and libraries SDK for managing resources on the Google Cloud Platform, plus kubectl and Python/PHP appengine SDK components pkgver = 150.0.0 - pkgrel = 1 + pkgrel = 2 url = https://cloud.google.com/sdk/ arch = i686 arch = x86_64 @@ -14,11 +14,11 @@ pkgbase = google-cloud-sdk optdepends = java-environment: for Java version of App Engine optdepends = php: for PHP version of App Engine optdepends = python2-crcmod: verify the integrity of object contents + provides = kubectl-bin conflicts = kubectl-bin conflicts = google-appengine-python-php conflicts = google-appengine-python conflicts = google-appengine-php - replaces = kubectl-bin replaces = google-appengine-python-php replaces = google-appengine-python replaces = google-appengine-php @@ -5,15 +5,16 @@ pkgname="google-cloud-sdk" pkgver=150.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Tools and libraries SDK for managing resources on the Google Cloud Platform, plus kubectl and Python/PHP appengine SDK components" url="https://cloud.google.com/sdk/" license=("Apache") arch=('i686' 'x86_64') # replaces() only works for sysupgrade, not normal install/upgrade +provides=('kubectl-bin') conflicts=('kubectl-bin' 'google-appengine-python-php' 'google-appengine-python' 'google-appengine-php') -replaces=('kubectl-bin' 'google-appengine-python-php' +replaces=('google-appengine-python-php' 'google-appengine-python' 'google-appengine-php') depends=('python2') makedepends=('python2') @@ -77,7 +78,7 @@ package() { "$pkgdir/etc/profile.d/google-cloud-sdk.sh" msg2 "Fixing python references for python2" - grep -rl 'python' "$pkgdir/opt/$pkgname" | \ + grep -Irl 'python' "$pkgdir/opt/$pkgname" | \ xargs sed -i 's|#!.*python\b|#!/usr/bin/env python2|g' find "$pkgdir/opt/$pkgname/bin/" -maxdepth 1 -type f -exec \ sed -i 's/CLOUDSDK_PYTHON=python\b/CLOUDSDK_PYTHON=python2/g' {} \; |