Skip to content

Commit 726d780

Browse files
committed
maybe fix
1 parent eb94a2f commit 726d780

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

python/private/stage1_bootstrap_template.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,17 @@ if [[ "$IS_ZIPFILE" == "1" ]]; then
6161

6262
else
6363
function find_runfiles_root() {
64+
local maybe_root=""
6465
if [[ -n "${RUNFILES_DIR:-}" ]]; then
65-
echo "$RUNFILES_DIR"
66-
return 0
66+
maybe_root="$RUNFILES_DIR"
6767
elif [[ "${RUNFILES_MANIFEST_FILE:-}" = *".runfiles_manifest" ]]; then
68-
echo "${RUNFILES_MANIFEST_FILE%%.runfiles_manifest}.runfiles"
69-
return 0
68+
maybe_root="${RUNFILES_MANIFEST_FILE%%.runfiles_manifest}.runfiles"
7069
elif [[ "${RUNFILES_MANIFEST_FILE:-}" = *".runfiles/MANIFEST" ]]; then
71-
echo "${RUNFILES_MANIFEST_FILE%%.runfiles/MANIFEST}.runfiles"
70+
maybe_root="${RUNFILES_MANIFEST_FILE%%.runfiles/MANIFEST}.runfiles"
71+
fi
72+
73+
if [[ -n "$maybe_root" && -e "$maybe_root/$STAGE2_BOOTSTRAP" ]]; then
74+
echo "$maybe_root"
7275
return 0
7376
fi
7477

0 commit comments

Comments
 (0)