Skip to content

Commit

Permalink
chore(shellcheck): Fix issues in update*.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
grzesuav committed Feb 26, 2020
1 parent dd03c92 commit 8b95e05
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions update_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#
set -o pipefail

# shellcheck source=common_functions.sh
source ./common_functions.sh

for ver in ${supported_versions}
Expand All @@ -31,7 +32,7 @@ do
echo " "
echo "==============================================================================="
# Generate the Dockerfiles for the unofficial images.
./update_multiarch.sh ${ver}
./update_multiarch.sh "${ver}"

# hotspot.config and openj9.config now only contain the unofficial image list.
# hotspot-official.config and openj9-official.config contain the officially supported list.
Expand All @@ -40,7 +41,7 @@ do
cp config/openj9-official.config config/openj9.config

# Now generate the Dockerfiles for the official images.
./update_multiarch.sh ${ver}
./update_multiarch.sh "${ver}"

# Restore the original files.
git checkout config/hotspot.config config/openj9.config
Expand Down
8 changes: 4 additions & 4 deletions update_manifest_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ do
echo " Generating Manifest Entries for Version ${ver} "
echo " "
echo "==============================================================================="
./generate_manifest_script.sh ${ver} ${vm} ${package}
./generate_manifest_script.sh "${ver}" "${vm}" "${package}"

err=$?
if [ ${err} != 0 -o ! -f ./manifest_commands.sh ]; then
if [ ${err} != 0 ] || [ ! -f ./manifest_commands.sh ]; then
echo
echo "ERROR: Docker Build for version ${ver} failed."
echo
Expand Down Expand Up @@ -68,8 +68,8 @@ do
echo " "
echo "==============================================================================="
# We will test all image types
cp ${test_image_types_all_file} ${test_image_types_file}
./test_multiarch.sh ${ver} ${vm} ${package}
cp "${test_image_types_all_file}" "${test_image_types_file}"
./test_multiarch.sh "${ver}" "${vm}" "${package}"
done
done
done
Expand Down

0 comments on commit 8b95e05

Please sign in to comment.