Skip to content

Commit

Permalink
Fix typos: ture -> true (#5360)
Browse files Browse the repository at this point in the history
Signed-off-by: Keith W. Campbell <[email protected]>
  • Loading branch information
keithc-ca authored May 31, 2024
1 parent 071c84b commit 3ccdcbe
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion doc/userGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Usage : get.sh --testdir|-t openjdktestdir
[--sdk_resource|-r ] : optional. Indicate where to download an sdk from - releases, nightly, upstream or customized
[--customizedURL|-c ] : optional. If downloading an sdk and if sdk source is set as customized, indicates sdk url
[--clone_openj9 ] : optional. ture or false. Clone openj9 if this flag is set to true. Default to true
[--clone_openj9 ] : optional. true or false. Clone openj9 if this flag is set to true. Default to true
[--openj9_repo ] : optional. OpenJ9 git repo. Default value https://github.com/eclipse-openj9/openj9.git is used if not provided
[--openj9_sha ] : optional. OpenJ9 pull request sha
[--openj9_branch ] : optional. OpenJ9 branch
Expand Down
30 changes: 15 additions & 15 deletions get.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ usage ()
echo ' [--customized_sourceURL|-S ] : indicate sdk source url if sdk source is set as customized.'
echo ' [--username ] : indicate username required if customized url requiring authorization is used'
echo ' [--password ] : indicate password required if customized url requiring authorization is used'
echo ' [--clone_openj9 ] : optional. ture or false. Clone openj9 if this flag is set to true. Default to true'
echo ' [--clone_openj9 ] : optional. true or false. Clone openj9 if this flag is set to true. Default to true'
echo ' [--openj9_repo ] : optional. OpenJ9 git repo. Default value https://github.com/eclipse-openj9/openj9.git is used if not provided'
echo ' [--openj9_sha ] : optional. OpenJ9 pull request sha.'
echo ' [--openj9_branch ] : optional. OpenJ9 branch.'
Expand Down Expand Up @@ -141,13 +141,13 @@ parseCommandLineArgs()

"--debug_images_required" )
DEBUG_IMAGES_REQUIRED="$1"; shift;;

"--code_coverage" )
CODE_COVERAGE="$1"; shift;;

"--curl_opts" )
CURL_OPTS="$1"; shift;;

"--additional_artifacts_required" )
ADDITIONAL_ARTIFACTS_REQUIRED="$1"; shift;;

Expand Down Expand Up @@ -262,16 +262,16 @@ getBinaryOpenjdk()
download_url=""
echo "--sdkdir is set to $SDK_RESOURCE. Therefore, skip download jdk binary"
fi

if [ "${download_url}" != "" ]; then
for file in $download_url
do
if [ "$ADDITIONAL_ARTIFACTS_REQUIRED" == "RI_JDK" ]; then
if [[ $file = *?[0-9] ]]; then
fileName=$(curl -k ${curl_options} ${file}/ | grep href | sed 's/.*href="//' | sed 's/".*//' | grep '^[a-zA-Z].*')
file=${file}/${fileName}
fi
fi
fi
fi
executeCmdWithRetry "${file##*/}" "_ENCODE_FILE_NEW=UNTAGGED curl -OLJSk${CURL_OPTS} ${curl_options} $file"
rt_code=$?
if [ $rt_code != 0 ]; then
Expand Down Expand Up @@ -391,17 +391,17 @@ getBinaryOpenjdk()
elif [[ "$jar_dir_name" =~ jre* ]] && [ "$jar_dir_name" != "j2re-image" ]; then
mv $jar_dir_name ../j2re-image
elif [[ "$jar_dir_name" =~ jdk* ]] && [ "$jar_dir_name" != "j2sdk-image" ]; then
# If test sdk has already been expanded, this one must be the additional sdk
# If test sdk has already been expanded, this one must be the additional sdk
isAdditional=0
if [ -f "./j2sdk-image/release" ]; then
if [ -f "./j2sdk-image/release" ]; then
isAdditional=1
else
if [ "$ADDITIONAL_ARTIFACTS_REQUIRED" == "RI_JDK" ]; then
else
if [ "$ADDITIONAL_ARTIFACTS_REQUIRED" == "RI_JDK" ]; then
# Check release info
if [ -d "./$jar_dir_name/Contents" ]; then # Mac
release_info=$( cat ./$jar_dir_name/Contents/Home/release )
UNZIPPED_ADDITIONAL_SDK="./$jar_dir_name/Contents/Home/"
else
else
release_info=$( cat ./$jar_dir_name/release )
UNZIPPED_ADDITIONAL_SDK="./$jar_dir_name/"
fi
Expand All @@ -420,7 +420,7 @@ getBinaryOpenjdk()
echo "RI JDK available at $SDKDIR/additionaljdkbinary/"
echo "RI JDK version:"
$SDKDIR/additionaljdkbinary/bin/java -version
else
else
mv $jar_dir_name ../j2sdk-image
fi
# The following only needed if openj9 has a different image name convention
Expand Down Expand Up @@ -533,7 +533,7 @@ executeCmdWithRetry()
count=$(( $count + 1 ))
done
set -e
return "$rt_code"
return "$rt_code"
}

getFunctionalTestMaterial()
Expand Down Expand Up @@ -776,7 +776,7 @@ if [ "$USE_TESTENV_PROPERTIES" = true ]; then
echo "load ./testenv/testenv.properties"
source ./testenv/testenv.properties
fi
if [[ $JDK_IMPL != "openj9" && $JDK_IMPL != "ibm" ]]; then
if [[ $JDK_IMPL != "openj9" && $JDK_IMPL != "ibm" ]]; then
echo "Running checkTags with $teFile and $JDK_VERSION"
./scripts/testenv/checkTags.sh $teFile $JDK_VERSION
fi
Expand Down Expand Up @@ -812,4 +812,4 @@ fi

if [ "$VENDOR_REPOS" != "" ]; then
getVendorTestMaterial
fi
fi

0 comments on commit 3ccdcbe

Please sign in to comment.