From 04e04ae33706f49e391b91d567582c06cc04f322 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Thu, 3 Aug 2023 19:58:33 +0000
Subject: [PATCH] ensure_bootstrap: always resolve base_dir with dirname

Other depot_tools scripts use dirname regardless of mingw,
so do that here too to simplify.

Bug: 1469696
Change-Id: Ia3c22a4eb72e62564eee1e8b18a88671c8b8b9a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4748852
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Joanna Wang <jojwang@chromium.org>
---
 ensure_bootstrap | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ensure_bootstrap b/ensure_bootstrap
index cd3a19ee9..ebcaa19a2 100755
--- a/ensure_bootstrap
+++ b/ensure_bootstrap
@@ -19,11 +19,8 @@
 OUTPUT="$(uname | grep 'MINGW')"
 MINGW=$?
 
-if [ $MINGW = 0 ]; then
-  base_dir="${0%/*}"
-else
-  base_dir=$(dirname "${BASH_SOURCE[0]}")
-
+base_dir=$(dirname "${BASH_SOURCE[0]}")
+if [ $MINGW != 0 ]; then
   # Don't bootstrap Python 3 on windows, since it is already done by
   # bootstrap/win_tools.bat.
   if [ "X$DEPOT_TOOLS_BOOTSTRAP_PYTHON3" != "X0" ]; then