Fix Win toolchain asset, fix script

infra/bots/assets/asset_utils.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Utilities for managing assets."""
 
@@ skipping 20 matching lines @@
 DEFAULT_CIPD_SERVICE_URL = 'https://chrome-infra-packages.appspot.com'
 
 DEFAULT_GS_BUCKET = 'skia-buildbots'
 GS_SUBDIR_TMPL = 'gs://%s/assets/%s'
 GS_PATH_TMPL = '%s/%s.zip'
 
 TAG_PROJECT_SKIA = 'project:skia'
 TAG_VERSION_PREFIX = 'version:'
 TAG_VERSION_TMPL = '%s%%s' % TAG_VERSION_PREFIX
 
+WHICH = 'where' if sys.platform.startswith('win') else 'which'
+
 VERSION_FILENAME = 'VERSION'
 ZIP_BLACKLIST = ['.git', '.svn', '*.pyc', '.DS_STORE']
 
 
 class CIPDStore(object):
   """Wrapper object for CIPD."""
   def __init__(self, cipd_url=DEFAULT_CIPD_SERVICE_URL):
     cipd = 'cipd'
     platform = 'linux64'
     if sys.platform == 'darwin':
@@ skipping 88 matching lines @@
       ])
 
   def delete_contents(self, name):
     """Delete data for the given asset."""
     self._run(['pkg-delete', CIPD_PACKAGE_NAME_TMPL % name])
 
 
 class GSStore(object):
   """Wrapper object for interacting with Google Storage."""
   def __init__(self, gsutil=None, bucket=DEFAULT_GS_BUCKET):
-    gsutil = os.path.abspath(gsutil) if gsutil else 'gsutil'
+    if gsutil:
+      gsutil = os.path.abspath(gsutil)
+    else:
+      gsutil = subprocess.check_output([WHICH, 'gsutil']).rstrip()
     self._gsutil = [gsutil]
     if gsutil.endswith('.py'):
       self._gsutil = ['python', gsutil]
     self._gs_bucket = bucket
 
   def copy(self, src, dst):
     """Copy src to dst."""
     subprocess.check_call(self._gsutil + ['cp', src, dst])
 
   def list(self, path):
@@ skipping 163 matching lines @@
       raise Exception('Asset %s does not exist!' % self._name)
 
     # Cleanup the store.
     if remove_in_store:
       self._store.delete_contents(self._name)
 
     # Remove the asset.
     subprocess.check_call([utils.GIT, 'rm', '-rf', self._dir])
     if os.path.isdir(self._dir):
       shutil.rmtree(self._dir)