Skip to content

Commit 5a0ba6b

Browse files
authored
chore: reformat for 80 columns; fix spacing (#3250)
* chore: reformat for 80 columns; fix spacing shell style guide specifies 80 columns since `echo` adds spaces between its arguments the line that was already split resulted in an extra space: `Verify installed headers created only expected directories.`
1 parent 5f33e4a commit 5a0ba6b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

ci/kokoro/docker/build-in-docker-cmake.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ if [[ "${SCAN_BUILD}" == "yes" ]]; then
4444
fi
4545

4646
echo
47-
echo "${COLOR_YELLOW}Starting docker build $(date) with ${NCPU} cores${COLOR_RESET}"
47+
echo "${COLOR_YELLOW}Starting docker build $(date) with ${NCPU}"\
48+
"cores${COLOR_RESET}"
4849
echo
4950

5051
echo "${COLOR_YELLOW}Started CMake config at: $(date)${COLOR_RESET}"
@@ -167,7 +168,8 @@ if [[ "${BUILD_TESTING:-}" = "yes" ]]; then
167168
for subdir in google/cloud google/cloud/bigtable google/cloud/storage; do
168169
echo
169170
echo "${COLOR_GREEN}Running integration tests for ${subdir}${COLOR_RESET}"
170-
(cd "${BINARY_DIR}" && "${PROJECT_ROOT}/${subdir}/ci/run_integration_tests.sh")
171+
(cd "${BINARY_DIR}" && \
172+
"${PROJECT_ROOT}/${subdir}/ci/run_integration_tests.sh")
171173
done
172174

173175
echo
@@ -185,8 +187,8 @@ if [[ "${TEST_INSTALL:-}" = "yes" ]]; then
185187
# Also verify that the install directory does not get unexpected files or
186188
# directories installed.
187189
echo
188-
echo "${COLOR_YELLOW}Verify installed headers created only" \
189-
" expected directories.${COLOR_RESET}"
190+
echo "${COLOR_YELLOW}Verify installed headers created only expected" \
191+
"directories.${COLOR_RESET}"
190192
if comm -23 \
191193
<(find /var/tmp/staging/include/google/cloud -type d | sort) \
192194
<(echo /var/tmp/staging/include/google/cloud ; \
@@ -198,7 +200,8 @@ if [[ "${TEST_INSTALL:-}" = "yes" ]]; then
198200
echo /var/tmp/staging/include/google/cloud/storage/oauth2 ; \
199201
echo /var/tmp/staging/include/google/cloud/storage/testing ; \
200202
/bin/true) | grep -q /var/tmp; then
201-
echo "${COLOR_YELLOW}Installed directories do not match expectation.${COLOR_RESET}"
203+
echo "${COLOR_YELLOW}Installed directories do not match" \
204+
"expectation.${COLOR_RESET}"
202205
echo "${COLOR_RED}Found:"
203206
find /var/tmp/staging/include/google/cloud -type d | sort
204207
echo "${COLOR_RESET}"
@@ -215,6 +218,7 @@ fi
215218
# If document generation is enabled, run it now.
216219
if [[ "${GENERATE_DOCS}" == "yes" ]]; then
217220
echo
218-
echo "${COLOR_YELLOW}Generating Doxygen documentation at: $(date).${COLOR_RESET}"
221+
echo "${COLOR_YELLOW}Generating Doxygen documentation at:" \
222+
"$(date).${COLOR_RESET}"
219223
cmake --build "${BINARY_DIR}" --target doxygen-docs -- -j "${NCPU}"
220224
fi

0 commit comments

Comments
 (0)