mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 18:51:29 +00:00
Revert 18633
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@18634 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
29
gclient
29
gclient
@@ -6,24 +6,7 @@
|
||||
# This script will try to sync the bootstrap directories and then defer control.
|
||||
|
||||
base_dir=$(dirname "$0")
|
||||
|
||||
# Update git checkouts prior the cygwin check, we don't want to use msysgit.
|
||||
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
|
||||
then
|
||||
(cd "$base_dir"; git svn fetch -q; git merge trunk -q)
|
||||
fi
|
||||
|
||||
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]
|
||||
then
|
||||
(cd "$base_dir/git-cl-repo"; git pull -q)
|
||||
fi
|
||||
|
||||
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-try-repo/.git" ]
|
||||
then
|
||||
(cd "$base_dir/git-try-repo"; git pull -q)
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Use the batch file as an entry point if on cygwin.
|
||||
if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then
|
||||
${base_dir}/gclient.bat "$@"
|
||||
@@ -31,12 +14,14 @@ if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then
|
||||
fi
|
||||
|
||||
|
||||
# We're on POSIX (not cygwin). We can now safely look for svn checkout.
|
||||
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
|
||||
then
|
||||
# Update the bootstrap directory to stay up-to-date with the latest
|
||||
# depot_tools.
|
||||
svn -q up "$base_dir"
|
||||
fi
|
||||
svn -q up "$base_dir/bootstrap"
|
||||
|
||||
exec python "$base_dir/gclient.py" "$@"
|
||||
# Then defer the control to the bootstrapper.
|
||||
exec "$base_dir/bootstrap/gclient.sh" "$@"
|
||||
else
|
||||
exec python "$base_dir/gclient.py" "$@"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user