InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 02:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cipd/python: optimize cat usage

Browse Source 
Bash has a builtin for reading files, so use that instead of running
the cat program to save on time & overhead.

Change-Id: Ia90fc22a47f2ead4ef056020a79ebdebd7bd70ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4111082
Reviewed-by: Brian Ryner <bryner@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
This commit is contained in:
Mike Frysinger
2023-01-23 15:31:10 +00:00
committed by LUCI CQ
parent e852391441
commit 67702834cc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cipd
View File

@@ -90,13 +90,13 @@ CIPD_BACKEND="https://chrome-infra-packages.appspot.com"
VERSION_FILE="${MYPATH}/cipd_client_version" VERSION_FILE="${MYPATH}/cipd_client_version"
CLIENT="${MYPATH}/.cipd_client" CLIENT="${MYPATH}/.cipd_client"
VERSION=`cat "${VERSION_FILE}"` VERSION=$(<"${VERSION_FILE}")
PLATFORM="${OS}-${ARCH}" PLATFORM="${OS}-${ARCH}"
# A value in .cipd_client_platform overrides the "guessed" platform. # A value in .cipd_client_platform overrides the "guessed" platform.
PLATFORM_OVERRIDE_FILE="${MYPATH}/.cipd_client_platform" PLATFORM_OVERRIDE_FILE="${MYPATH}/.cipd_client_platform"
if [ -f "${PLATFORM_OVERRIDE_FILE}" ]; then if [ -f "${PLATFORM_OVERRIDE_FILE}" ]; then
PLATFORM=`cat ${PLATFORM_OVERRIDE_FILE}` PLATFORM=$(<"${PLATFORM_OVERRIDE_FILE}")
fi fi
URL="${CIPD_BACKEND}/client?platform=${PLATFORM}&version=${VERSION}" URL="${CIPD_BACKEND}/client?platform=${PLATFORM}&version=${VERSION}"
@@ -232,7 +232,7 @@ function self_update() {
# so mismatches are very unlikely. # so mismatches are very unlikely.
INSTALLED_VERSION_FILE="${MYPATH}/.versions/.cipd_client.cipd_version" INSTALLED_VERSION_FILE="${MYPATH}/.versions/.cipd_client.cipd_version"
if [ -f "${INSTALLED_VERSION_FILE}" ]; then if [ -f "${INSTALLED_VERSION_FILE}" ]; then
JSON_BODY=`cat "${INSTALLED_VERSION_FILE}"` JSON_BODY=$(<"${INSTALLED_VERSION_FILE}")
if [[ "$JSON_BODY" != *"infra/tools/cipd/${PLATFORM}"* ]]; then if [[ "$JSON_BODY" != *"infra/tools/cipd/${PLATFORM}"* ]]; then
>&2 echo "Detected CIPD client platform change to ${PLATFORM}." >&2 echo "Detected CIPD client platform change to ${PLATFORM}."
>&2 echo "Deleting the existing client to trigger the bootstrap..." >&2 echo "Deleting the existing client to trigger the bootstrap..."

2
python-bin/python3
View File

@@ -6,7 +6,7 @@ if [ "$OSTYPE" = "msys" ]
then then
PYTHON3_BIN_DIR="$DEPOT_TOOLS/$(sed -e 's-\\-/-g' $DEPOT_TOOLS/python3_bin_reldir.txt)" PYTHON3_BIN_DIR="$DEPOT_TOOLS/$(sed -e 's-\\-/-g' $DEPOT_TOOLS/python3_bin_reldir.txt)"
else else
PYTHON3_BIN_DIR="$DEPOT_TOOLS/$(cat $DEPOT_TOOLS/python3_bin_reldir.txt)" PYTHON3_BIN_DIR="$DEPOT_TOOLS/$(<"$DEPOT_TOOLS/python3_bin_reldir.txt")"
fi fi
PATH="$PYTHON3_BIN_DIR":"$PYTHON3_BIN_DIR/Scripts":"$PATH" PATH="$PYTHON3_BIN_DIR":"$PYTHON3_BIN_DIR/Scripts":"$PATH"
"$PYTHON3_BIN_DIR/python3" "$@" "$PYTHON3_BIN_DIR/python3" "$@"

2
python2-bin/python2
View File

@@ -8,7 +8,7 @@ then
# this converts them to the forward slashes a unix environment expects. # this converts them to the forward slashes a unix environment expects.
PYTHON_BIN_DIR="$DEPOT_TOOLS/$(sed -e 's-\\-/-g' $DEPOT_TOOLS/python_bin_reldir.txt)" PYTHON_BIN_DIR="$DEPOT_TOOLS/$(sed -e 's-\\-/-g' $DEPOT_TOOLS/python_bin_reldir.txt)"
else else
PYTHON_BIN_DIR="$DEPOT_TOOLS/$(cat $DEPOT_TOOLS/python_bin_reldir.txt)" PYTHON_BIN_DIR="$DEPOT_TOOLS/$(<"$DEPOT_TOOLS/python_bin_reldir.txt")"
fi fi
PATH="$PYTHON_BIN_DIR":"$PATH" PATH="$PYTHON_BIN_DIR":"$PATH"
"$PYTHON_BIN_DIR/python" "$@" "$PYTHON_BIN_DIR/python" "$@"