new release: google-cloud-sdk 270.0.0-1

upstream release

2 files changed, 17 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ad8778b0444..8b4baea1733e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = google-cloud-sdk
 	pkgdesc = A set of command-line tools for the Google Cloud Platform. Includes gcloud (with beta and alpha commands), gsutil, and bq.
-	pkgver = 269.0.0
+	pkgver = 270.0.0
 	pkgrel = 1
 	url = https://cloud.google.com/sdk/
 	arch = x86_64
 	license = Apache
-	depends = python2
+	depends = python3
 	optdepends = python2-crcmod: [gsutil] verify the integrity of GCS object contents
 	options = !strip
 	options = staticlibs
-	source = https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/google-cloud-sdk_269.0.0.orig.tar.gz
+	source = https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/google-cloud-sdk_270.0.0.orig.tar.gz
 	source = google-cloud-sdk.sh
-	sha256sums = d5cb41e9e4892fc1ee2b8091e9ca3923be41efe1f91a6d8edbf9a7d8d1e97536
+	sha256sums = 0d77c00bcba0cde023b3b9b993029f81bd964a055124b29f1e7d0af8130fd611
 	sha256sums = 36ac88de630e49ea4b067b1f5f229142e4cf97561b98b3bd3d8115a356946692
 
 pkgname = google-cloud-sdk
diff --git a/PKGBUILD b/PKGBUILD
index 603d4d37302d..54c992c49dbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Benjamin Denhartog <ben@sudoforge.com>
+# PACKAGER: Benjamin Denhartog <ben@sudoforge.com>
 # Contributor: Mansour Behabadi <mansour@oxplot.com>
 # Contributor: Troy Engel <troyengel+arch@gmail.com>
 # Contributor: Geoff Hill <geoff@geoffhill.org>
@@ -6,13 +7,13 @@
 # Contributor: Justin Dray <justin@dray.be>
 
 pkgname="google-cloud-sdk"
-pkgver=269.0.0
+pkgver=270.0.0
 pkgrel=1
 pkgdesc="A set of command-line tools for the Google Cloud Platform. Includes gcloud (with beta and alpha commands), gsutil, and bq."
 url="https://cloud.google.com/sdk/"
 license=("Apache")
 arch=('x86_64')
-depends=('python2')
+depends=('python3')
 optdepends=('python2-crcmod: [gsutil] verify the integrity of GCS object contents')
 options=('!strip' 'staticlibs')
 source=(
@@ -20,51 +21,16 @@ source=(
   "google-cloud-sdk.sh"
 )
 sha256sums=(
-  'd5cb41e9e4892fc1ee2b8091e9ca3923be41efe1f91a6d8edbf9a7d8d1e97536'
+  '0d77c00bcba0cde023b3b9b993029f81bd964a055124b29f1e7d0af8130fd611'
   '36ac88de630e49ea4b067b1f5f229142e4cf97561b98b3bd3d8115a356946692'
 )
 
-prepare() {
-  if command ping -c 1 dl.google.com > /dev/null 2>&1; then
-    msg2 "Checking for newer upstream release"
-
-    _latest=$(\
-      curl -s https://dl.google.com/dl/cloudsdk/release/sha256.txt |\
-      egrep "google-cloud-sdk_.*\.orig\.tar\.gz" |\
-      awk -e 'BEGIN{FS="/"}{print $4}' |\
-      sed 's/[^0-9]*\(\([[:digit:]]\+.\?\)\{2\}[^.]\+\).*/\1/')
-        # [^0-9]* :: matches any non-digit character 0-n times
-        # \( :: begins group 1
-        #   \([[:digit:]]\+.\?\)\{2\}
-        #     :: captures the major and minor parts of the version, with dot
-        #     :: capture group 2 is created to facilitate repeating with \{2\}
-        #   [^.]\+ :: matches the patch without the dot
-        # \) :: terminates group 1
-        # .* :: matches any character 0-n times
-        # /\1/ :: replaces the entire string with the contents of group 1
-
-    msg2 "This AUR release: ${pkgver}"
-    msg2 "Latest upstream release: ${_latest}"
-    if [ "${_latest}" != "${pkgver}" ]; then
-      msg2 "** THIS PACKAGE IS OUT OF DATE"
-      msg2 "** Please flag this package out-of-date:"
-      msg2 "     https://aur.archlinux.org/packages/${pkgname}"
-      msg2 "** Alternatively, submit an issue and/or patch:"
-      msg2 "     https://github.com/sudoforge/pkgbuilds"
-    else
-      msg2 "Everything up to date :)"
-    fi
-  else
-    msg2 "Unable to reach dl.google.com, cannot determine latest upstream release"
-  fi
-}
-
 package() {
-  msg2 "Copying core SDK components"
+  echo "Copying core SDK components"
   mkdir "${pkgdir}/opt"
   cp -r "${srcdir}/${pkgname}" "${pkgdir}/opt"
 
-  msg2 "Running bootstrapping script"
+  echo "Running bootstrapping script"
 
   # The Google code uses a _TraceAction() method which spams the screen even
   # in "quiet" mode, we're throwing away output on purpose to keep it clean
@@ -77,19 +43,19 @@ package() {
     --additional-components "" \
     1 > /dev/null
 
-  msg2 "Cleaning up artifacts of the bootstrap script"
+  echo "Cleaning up artifacts of the bootstrap script"
   rm -rf "${pkgdir}/opt/${pkgname}/.install/.backup"
   mkdir "${pkgdir}/opt/${pkgname}/.install/.backup"
 
-  msg2 "Setting up profile environment variables"
+  echo "Setting up profile environment variables"
   install -Dm755 "${srcdir}/${source[1]}" \
     "${pkgdir}/etc/profile.d/google-cloud-sdk.sh"
 
-  msg2 "Installing bash completion script"
+  echo "Installing bash completion script"
   install -Dm755 "${pkgdir}/opt/${pkgname}/completion.bash.inc" \
     "${pkgdir}/etc/bash_completion.d/google-cloud-sdk"
 
-  msg2 "Fixing python references for python2 and compiling *.pyc"
+  echo "Fixing python references for python2 and compiling *.pyc"
   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 \
@@ -97,20 +63,20 @@ package() {
   python2 -m compileall -q -f -x python3 -d "/opt/google-cloud-sdk" \
     "${pkgdir}/opt/${pkgname}/"
 
-  msg2 "Installing man pages"
+  echo "Installing man pages"
   mkdir -p "${pkgdir}/usr/share"
   mv -f "${pkgdir}/opt/${pkgname}/help/man" "${pkgdir}/usr/share/"
   chmod 0755 "${pkgdir}/usr/share/man"
   chmod 0755 "${pkgdir}/usr/share/man/man1"
 
-  msg2 "Creating symlinks for applications"
+  echo "Creating symlinks for applications"
   mkdir -p "${pkgdir}/usr/bin"
   for i in "${pkgdir}/opt/${pkgname}/bin"/*; do
     ln -st "${pkgdir}/usr/bin/" "${i#${pkgdir}}"
   done
   rm -f "${pkgdir}"/usr/bin/{bq,dev_appserver.py*,endpointscfg.py*,java_dev_appserver.sh}
 
-  msg2 "Fixing file permissions"
+  echo "Fixing file permissions"
   chmod -x "${pkgdir}"/usr/share/man/man1/*
   find "${pkgdir}/opt/${pkgname}" -name "*.html" -o -name "*.json" -exec chmod -x {} \;
   find "${pkgdir}/opt/${pkgname}" -name "*_test.py" -exec chmod +x {} \;