Skip to content

Commit cb49caf

Browse files
jfpanissetjfpanisset
committed
More SonarCloud warnings resolved
- [ vs [[ in shell scripts - quoting in Dockerfiles Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
1 parent 07f2292 commit cb49caf

File tree

13 files changed

+25
-26
lines changed

13 files changed

+25
-26
lines changed

‎ci-common/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci-common/image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ docker_commands: |
6262
RUN export DOWNLOADS_DIR=/tmp/downloads && \
6363
mkdir /tmp/downloads && \
6464
/tmp/install_sonar.sh && \
65-
export PATH=${PATH}:/opt/aswfbuilder/bin && \
65+
export PATH="${PATH}":/opt/aswfbuilder/bin && \
6666
/tmp/install_dev_cmake.sh && \
6767
/tmp/install_ccache.sh && \
6868
rm -rf /tmp/downloads && \

‎ci-openrv/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci-openrv/image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ docker_post_commands: |
1818
# This approach may be revisited if OpenRV uses PySide2 package from Artifactory.
1919
RUN --mount=type=cache,target=/opt/conan_home/d \
2020
--mount=type=bind,rw,target=/opt/conan_home/.conan,source=packages/conan/settings \
21-
conan install qt/${ASWF_QT_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} --install-folder /tmp/qttemp
21+
conan install qt/"${ASWF_QT_VERSION}"@"${ASWF_PKG_ORG}"/"${ASWF_CONAN_CHANNEL}" --install-folder /tmp/qttemp

‎packages/common/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \
137137
--mount=type=bind,rw,target=${ASWF_CONAN_HOME}/.conan2,source=packages/conan/settings \
138138
--mount=type=bind,rw,target=${ASWF_CONAN_HOME}/recipes,source=packages/conan/recipes \
139139
conan create \
140-
${ASWF_CONAN_BUILD_MISSING} \
141-
${ASWF_CONAN_NO_REMOTE} \
142-
--profile:all ${ASWF_CONAN_HOME}/.conan2/profiles_${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} \
143-
--name ${ASWF_PKG_NAME} \
144-
--version ${ASWF_PKG_VERSION} \
145-
--user ${ASWF_PKG_ORG} \
146-
--channel ${ASWF_CONAN_CHANNEL} \
147-
${ASWF_PKG_DIR}/$(if [ -f ${ASWF_PKG_YML} ] ; then yq '.versions["'"${ASWF_PKG_VERSION}"'"].folder' ${ASWF_PKG_YML} ; fi)
140+
"${ASWF_CONAN_BUILD_MISSING}" \
141+
"${ASWF_CONAN_NO_REMOTE}" \
142+
--profile:all "${ASWF_CONAN_HOME}"/.conan2/profiles_"${ASWF_PKG_ORG}"/"${ASWF_CONAN_CHANNEL}" \
143+
--name "${ASWF_PKG_NAME}" \
144+
--version "${ASWF_PKG_VERSION}" \
145+
--user "${ASWF_PKG_ORG}" \
146+
--channel "${ASWF_CONAN_CHANNEL}" \
147+
"${ASWF_PKG_DIR}"/$(if [ -f "${ASWF_PKG_YML}" ] ; then yq '.versions["'"${ASWF_PKG_VERSION}"'"].folder' "${ASWF_PKG_YML}" ; fi)
148148

149149
# Upload build to repository if called for
150150
RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \
@@ -154,7 +154,7 @@ RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \
154154
--mount=type=secret,id=conan_login_username,env=CONAN_LOGIN_USERNAME \
155155
--mount=type=secret,id=conan_password,env=CONAN_PASSWORD \
156156
if [ -n "${ASWF_CONAN_PUSH}" ] ; then \
157-
conan upload --remote ${ASWF_PKG_ORG} ${ASWF_PKG_NAME}/${ASWF_PKG_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} ;\
157+
conan upload --remote "${ASWF_PKG_ORG}" "${ASWF_PKG_NAME}"/"${ASWF_PKG_VERSION}"@"${ASWF_PKG_ORG}"/"${ASWF_CONAN_CHANNEL}" ;\
158158
else \
159159
echo "conan upload of package ${ASWF_PKG_NAME} skipped" ; \
160160
fi

‎packages/review/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ EOF
7676

7777
RUN --mount=type=cache,target=/opt/conan_home/d \
7878
--mount=type=bind,rw,target=/opt/conan_home/.conan2,source=packages/conan/settings \
79-
/tmp/install_conanpackages.sh /usr/local vfx${ASWF_VFXPLATFORM_VERSION}
79+
/tmp/install_conanpackages.sh /usr/local vfx"${ASWF_VFXPLATFORM_VERSION}"
8080

8181
COPY ../scripts/common/before_build.sh \
8282
../scripts/common/copy_new_files.sh \
@@ -132,7 +132,7 @@ EOF
132132

133133
RUN --mount=type=cache,target=/opt/conan_home/d \
134134
--mount=type=bind,rw,target=/opt/conan_home/.conan2,source=packages/conan/settings \
135-
/tmp/install_conanpackages.sh /usr/local vfx${ASWF_VFXPLATFORM_VERSION}
135+
/tmp/install_conanpackages.sh /usr/local vfx"${ASWF_VFXPLATFORM_VERSION}"
136136

137137
# Qt files are under /tmp/qttemp because OpenRV compiles its own PySide2 and it
138138
# causes issues during the build when Qt is within system folder (e.g. /usr/local)
@@ -148,7 +148,7 @@ EOF
148148

149149
RUN --mount=type=cache,target=/opt/conan_home/d \
150150
--mount=type=bind,rw,target=/opt/conan_home/.conan2,source=packages/conan/settings \
151-
/tmp/install_conanpackages.sh /tmp/qttemp vfx${ASWF_VFXPLATFORM_VERSION}
151+
/tmp/install_conanpackages.sh /tmp/qttemp vfx"${ASWF_VFXPLATFORM_VERSION}"
152152

153153
RUN --mount=type=cache,target=/tmp/ccache \
154154
--mount=type=cache,sharing=private,target=/tmp/downloads \

‎packages/vfx2/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ EOF
9090

9191
RUN --mount=type=cache,target=/opt/conan_home/d \
9292
--mount=type=bind,rw,target=/opt/conan_home/.conan2,source=packages/conan/settings \
93-
/tmp/install_conanpackages.sh /usr/local vfx${ASWF_VFXPLATFORM_VERSION} vfx2
93+
/tmp/install_conanpackages.sh /usr/local vfx"${ASWF_VFXPLATFORM_VERSION}" vfx2
9494

9595
COPY ../scripts/common/before_build.sh \
9696
../scripts/common/copy_new_files.sh \
@@ -183,7 +183,7 @@ EOF
183183

184184
RUN --mount=type=cache,target=/opt/conan_home/d \
185185
--mount=type=bind,rw,target=/opt/conan_home/.conan2,source=packages/conan/settings \
186-
/tmp/install_conanpackages.sh /usr/local vfx${ASWF_VFXPLATFORM_VERSION} usd
186+
/tmp/install_conanpackages.sh /usr/local vfx"${ASWF_VFXPLATFORM_VERSION}" usd
187187

188188
RUN --mount=type=cache,target=/tmp/ccache \
189189
--mount=type=cache,sharing=private,target=/tmp/downloads \
@@ -259,7 +259,7 @@ COPY ../scripts/vfx/build_otio.sh \
259259

260260
RUN --mount=type=cache,target=/opt/conan_home/d \
261261
--mount=type=bind,rw,target=/opt/conan_home/.conan2,source=packages/conan/settings \
262-
/tmp/install_conanpackages.sh /usr/local vfx${ASWF_VFXPLATFORM_VERSION} otio
262+
/tmp/install_conanpackages.sh /usr/local vfx"${ASWF_VFXPLATFORM_VERSION}" otio
263263

264264
RUN --mount=type=cache,target=/tmp/ccache \
265265
--mount=type=cache,sharing=private,target=/tmp/downloads \

‎scripts/common/install_conanpackages.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ else
6262
# Better hope there's only one version of the package
6363
RELEASE_DIR=""
6464
INSTALLED_PACKAGE_VERSION=$(find $1/full_deploy/host/${INSTALLED_PACKAGE} -mindepth 1 -maxdepth 1 -printf "%f\n" -quit)
65-
if [ -d $1/full_deploy/host/${INSTALLED_PACKAGE}/${INSTALLED_PACKAGE_VERSION}/Release ]; then
65+
if [[ -d $1/full_deploy/host/${INSTALLED_PACKAGE}/${INSTALLED_PACKAGE_VERSION}/Release ]]; then
6666
# Full packages have extra path component based on Debug/Release and architecture, header-only packages don't
6767
RELEASE_DIR="Release/x86_64"
6868
fi

‎scripts/common/install_dev_ccache.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export DEV_CCACHE_VERSION=$ASWF_CCACHE_VERSION
99
mkdir ccache
1010
cd ccache
1111

12-
if [ ! -f "$DOWNLOADS_DIR/ccache-${DEV_CCACHE_VERSION}.tar.gz" ]; then
12+
if [[ ! -f "$DOWNLOADS_DIR/ccache-${DEV_CCACHE_VERSION}.tar.gz" ]]; then
1313
curl --location "https://github.com/ccache/ccache/releases/download/v${DEV_CCACHE_VERSION}/ccache-${DEV_CCACHE_VERSION}.tar.gz" -o "$DOWNLOADS_DIR/ccache-${DEV_CCACHE_VERSION}.tar.gz"
1414
fi
1515

‎scripts/common/install_dev_cmake.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mkdir -p /opt/aswfbuilder
88

99
export DEV_CMAKE_VERSION=$ASWF_CMAKE_VERSION
1010

11-
if [ ! -f "$DOWNLOADS_DIR/cmake-${DEV_CMAKE_VERSION}-Linux-x86_64.sh" ]; then
11+
if [[ ! -f "$DOWNLOADS_DIR/cmake-${DEV_CMAKE_VERSION}-Linux-x86_64.sh" ]]; then
1212
curl --location "https://github.com/Kitware/CMake/releases/download/v${DEV_CMAKE_VERSION}/cmake-${DEV_CMAKE_VERSION}-Linux-x86_64.sh" -o "$DOWNLOADS_DIR/cmake-${DEV_CMAKE_VERSION}-Linux-x86_64.sh"
1313
fi
1414
sh "$DOWNLOADS_DIR/cmake-${DEV_CMAKE_VERSION}-Linux-x86_64.sh" --skip-license --prefix=/opt/aswfbuilder --exclude-subdir

0 commit comments

Comments
 (0)