Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(896)

Side by Side Diff: update_depot_tools

Issue 3856006: A refactoring left cygwin busted.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: '' Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gclient ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # This script will try to sync the bootstrap directories and then defer control. 6 # This script will try to sync the bootstrap directories and then defer control.
7 7
8 base_dir=$(dirname "$0") 8 base_dir=$(dirname "$0")
9 9
10 # Test git and git --version. 10 # Test git and git --version.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 # work around a git-svn --quiet bug 47 # work around a git-svn --quiet bug
48 OUTPUT=`git svn rebase -q -q` 48 OUTPUT=`git svn rebase -q -q`
49 if [[ ! "$OUTPUT" =~ Current.branch ]]; then 49 if [[ ! "$OUTPUT" =~ Current.branch ]]; then
50 echo $OUTPUT 50 echo $OUTPUT
51 fi 51 fi
52 cd - > /dev/null 52 cd - > /dev/null
53 fi 53 fi
54 54
55 # Use the batch file as an entry point if on cygwin. 55 # Use the batch file as an entry point if on cygwin.
56 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then 56 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then
57 ${base_dir}/gclient.bat "$@" 57 ${base_dir}/bootstrap/update_depot_tools.bat
58 exit 58 exit
59 fi 59 fi
60 60
61
62 # We're on POSIX (not cygwin). We can now safely look for svn checkout. 61 # We're on POSIX (not cygwin). We can now safely look for svn checkout.
63 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] 62 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
64 then 63 then
65 # Update the bootstrap directory to stay up-to-date with the latest 64 # Update the bootstrap directory to stay up-to-date with the latest
66 # depot_tools. 65 # depot_tools.
67 svn -q up "$base_dir" 66 svn -q up "$base_dir"
68 fi 67 fi
OLDNEW
« no previous file with comments | « gclient ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698