Skip to content

Commit 9768ba9

Browse files
committed
Fix shellcheck failures in stage-upload.sh
update pull request update pull request update pull request update pull request
1 parent 8a2f8e6 commit 9768ba9

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

cluster/gce/gci/mounter/stage-upload.sh

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,30 @@ ACI_DIR=${STAGING_DIR}/gci-mounter
3939
CWD=${PWD}
4040

4141
# Cleanup the temporary directories
42-
function cleanup {
43-
rm -rf ${DOWNLOAD_DIR}
44-
rm -rf ${STAGING_DIR}
45-
cd ${CWD}
42+
cleanup() {
43+
rm -rf "${DOWNLOAD_DIR}"
44+
rm -rf "${STAGING_DIR}"
45+
cd "${CWD}"
4646
}
4747

4848
# Delete temporary directories on exit
4949
trap cleanup EXIT
5050

51-
mkdir ${ACI_DIR}
51+
mkdir "${ACI_DIR}"
5252

5353
# Convert docker image to aci and stage it
5454
echo "Downloading docker2aci ${DOCKER2ACI_VERSION}"
55-
wget "https://github.com/appc/docker2aci/releases/download/${DOCKER2ACI_VERSION}/docker2aci-${DOCKER2ACI_VERSION}.tar.gz" &> /dev/null
55+
wget "https://github.com/appc/docker2aci/releases/download/${DOCKER2ACI_VERSION}/docker2aci-${DOCKER2ACI_VERSION}.tar.gz" >/dev/null 2>&1
5656
echo "Extracting docker2aci ${DOCKER2ACI_VERSION}"
5757
tar xzf docker2aci-${DOCKER2ACI_VERSION}.tar.gz
58-
ACI_IMAGE=$(${DOWNLOAD_DIR}/docker2aci-${DOCKER2ACI_VERSION}/docker2aci ${DOCKER_IMAGE} 2>/dev/null | tail -n 1)
59-
cp ${ACI_IMAGE} ${ACI_DIR}/${MOUNTER_ACI_IMAGE}
58+
ACI_IMAGE=$("${DOWNLOAD_DIR}/docker2aci-${DOCKER2ACI_VERSION}/docker2aci" "${DOCKER_IMAGE}" 2>/dev/null | tail -n 1)
59+
cp "${ACI_IMAGE}" "${ACI_DIR}/${MOUNTER_ACI_IMAGE}"
6060

6161
# Upload the contents to gcs
6262
echo "Uploading gci mounter ACI in ${ACI_DIR} to ${MOUNTER_GCS_DIR}"
63-
gsutil cp ${ACI_DIR}/${MOUNTER_ACI_IMAGE} ${MOUNTER_GCS_DIR}
63+
gsutil cp "${ACI_DIR}/${MOUNTER_ACI_IMAGE}" "${MOUNTER_GCS_DIR}"
6464

6565
echo "Upload completed"
6666
echo "Updated gci-mounter ACI version and SHA1 in cluster/gce/gci/configure.sh"
67-
echo "${MOUNTER_ACI_IMAGE} hash: $(sha1sum ${ACI_DIR}/${MOUNTER_ACI_IMAGE})"
67+
ACI_HASH=$(sha1sum "${ACI_DIR}/${MOUNTER_ACI_IMAGE}")
68+
echo "${MOUNTER_ACI_IMAGE} hash: ${ACI_HASH}"

hack/.shellcheck_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
./cluster/gce/gci/flexvolume_node_setup.sh
1212
./cluster/gce/gci/health-monitor.sh
1313
./cluster/gce/gci/master-helper.sh
14-
./cluster/gce/gci/mounter/stage-upload.sh
1514
./cluster/gce/gci/shutdown.sh
1615
./cluster/gce/list-resources.sh
1716
./cluster/gce/upgrade-aliases.sh

0 commit comments

Comments
 (0)