This repository was archived by the owner on Jan 5, 2021. It is now read-only.
Preserve multi-word parameters. Use TEMP and JAVA_HOME. #299
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,20 @@ | ||
| #!/bin/bash | ||
|
|
||
| tempdir="${TEMP:-/tmp}" | ||
| javahome=${JAVA_HOME} | ||
| if [[ "${OSTYPE}" == "cygwin" ]] ; then | ||
| tempdirnative=$(cygpath -wa "${tempdir}") | ||
| if (( ${#javahome} )) ; then | ||
| javahomeposix=$(cygpath -ua "${javahome}") | ||
| fi | ||
| else | ||
| tempdirnative=${tempdir} | ||
| javahomeposix="${javahome}" | ||
| fi | ||
| if (( ${#javahome} )) ; then | ||
| export PATH="${javahomeposix}/bin:${PATH}" | ||
| fi | ||
|
|
||
| # DETECT_LATEST_RELEASE_VERSION should be set in your | ||
| # environment if you wish to use a version different | ||
| # from LATEST. | ||
|
|
@@ -13,10 +28,10 @@ DETECT_RELEASE_VERSION=${DETECT_LATEST_RELEASE_VERSION} | |
| # a new commit is added to the master branch. | ||
| DETECT_USE_SNAPSHOT=${DETECT_USE_SNAPSHOT:-0} | ||
|
|
||
| # DETECT_JAR_PATH overrides the location to store the | ||
| # downloaded Hub Detect JAR. It defaults to | ||
| # ${TEMP:-/tmp}. | ||
| DETECT_JAR_PATH=${DETECT_JAR_PATH:-${tempdirnative}} | ||
|
|
||
| # If you want to pass any java options to the | ||
| # invocation, specify DETECT_JAVA_OPTS in your | ||
|
|
@@ -27,27 +42,21 @@ DETECT_JAVA_OPTS=${DETECT_JAVA_OPTS:-} | |
| # If you want to pass any additional options to | ||
| # curl, specify DETECT_CURL_OPTS in your environment. | ||
| # For example, to specify a proxy, you would set | ||
| # DETECT_CURL_OPTS="--proxy http://myproxy:3128" | ||
| DETECT_CURL_OPTS=${DETECT_CURL_OPTS:-} | ||
|
|
||
| script_args=("$@") | ||
| loggable_script_args=() | ||
| for arg in "${script_args[@]}" ; do | ||
| if [[ "${arg}" =~ ^(.*\.(password|token)[^=]*)=.* ]] ; then | ||
| arg="${BASH_REMATCH[1]}=<redacted>" | ||
| fi | ||
| loggable_script_args+=("${arg}") | ||
| done | ||
|
|
||
| run() { | ||
| get_detect | ||
| run_detect || return $? | ||
| } | ||
|
|
||
| get_detect() { | ||
|
|
@@ -57,63 +66,53 @@ get_detect() { | |
| CURRENT_VERSION=$( <$VERSION_FILE_DESTINATION ) | ||
| fi | ||
|
|
||
| curl -sSL $DETECT_CURL_OPTS -o "${VERSION_FILE_DESTINATION}" https://blackducksoftware.github.io/hub-detect/latest-commit-id.txt | ||
| LATEST_VERSION=$(<"${VERSION_FILE_DESTINATION}") | ||
|
|
||
| if [ $DETECT_USE_SNAPSHOT -eq 1 ]; then | ||
| if [ -z "${DETECT_RELEASE_VERSION}" ]; then | ||
| DETECT_SOURCE="https://test-repo.blackducksoftware.com/artifactory/bds-integrations-snapshot/com/blackducksoftware/integration/hub-detect/latest-SNAPSHOT/hub-detect-latest-SNAPSHOT.jar" | ||
| DETECT_DESTINATION="${DETECT_JAR_PATH}/hub-detect-latest-SNAPSHOT.jar" | ||
| echo "will look for snapshot: ${DETECT_SOURCE}" >&2 | ||
| else | ||
| DETECT_SOURCE="https://test-repo.blackducksoftware.com/artifactory/bds-integrations-snapshot/com/blackducksoftware/integration/hub-detect/${DETECT_RELEASE_VERSION}/hub-detect-${DETECT_RELEASE_VERSION}.jar" | ||
| DETECT_DESTINATION="${DETECT_JAR_PATH}/hub-detect-${DETECT_RELEASE_VERSION}.jar" | ||
| echo "will look for release: ${DETECT_SOURCE}" >&2 | ||
| fi | ||
| else | ||
| if [ -z "${DETECT_RELEASE_VERSION}" ]; then | ||
| DETECT_RELEASE_VERSION=$(curl -sSL $DETECT_CURL_OPTS 'https://test-repo.blackducksoftware.com/artifactory/api/search/latestVersion?g=com.blackducksoftware.integration&a=hub-detect&repos=bds-integrations-release') | ||
|
Contributor
There was a problem hiding this comment. looking up the Curl man page, I think this is supposed to be -ssl not -sSL. Could you change these?
Author
There was a problem hiding this comment. Each letter in the -XYZ notation is a separate option. I added the lower-case "s" to hide the progress screen and an upper-case S to show error messages such as Zscaler certificate errors. My employer has a ticket 00085307 on specifying a space-separated value in one of the parameters, |
||
| DETECT_SOURCE="https://test-repo.blackducksoftware.com/artifactory/bds-integrations-release/com/blackducksoftware/integration/hub-detect/${DETECT_RELEASE_VERSION}/hub-detect-${DETECT_RELEASE_VERSION}.jar" | ||
| DETECT_DESTINATION="${DETECT_JAR_PATH}/hub-detect-${DETECT_RELEASE_VERSION}.jar" | ||
| else | ||
| DETECT_SOURCE="https://test-repo.blackducksoftware.com/artifactory/bds-integrations-release/com/blackducksoftware/integration/hub-detect/${DETECT_RELEASE_VERSION}/hub-detect-${DETECT_RELEASE_VERSION}.jar" | ||
| DETECT_DESTINATION="${DETECT_JAR_PATH}/hub-detect-${DETECT_RELEASE_VERSION}.jar" | ||
| fi | ||
| echo "will look for release: ${DETECT_SOURCE}" >&2 | ||
| fi | ||
|
|
||
| USE_REMOTE=1 | ||
| if [ "$CURRENT_VERSION" != "$LATEST_VERSION" ] && [ $DETECT_USE_SNAPSHOT -eq 1 ]; then | ||
| echo "You don't have the latest snapshot, so the new snapshot will be downloaded." >&2 | ||
| elif [ ! -f $DETECT_DESTINATION ]; then | ||
| echo "You don't have the current file, so it will be downloaded." >&2 | ||
| else | ||
| echo "You have already downloaded the latest file, so the local file will be used." >&2 | ||
| USE_REMOTE=0 | ||
| fi | ||
|
|
||
| if [ $USE_REMOTE -eq 1 ]; then | ||
| echo "getting ${DETECT_SOURCE} from remote" >&2 | ||
| curl -sSL $DETECT_CURL_OPTS -o "${DETECT_DESTINATION}" "${DETECT_SOURCE}" | ||
| echo "saved ${DETECT_SOURCE} to ${DETECT_DESTINATION}" >&2 | ||
| fi | ||
| } | ||
|
|
||
| run_detect() { | ||
| javacmd=(java ${DETECT_JAVA_OPTS} -jar "${DETECT_DESTINATION}") | ||
| type -a java || return -1 | ||
|
There was a problem hiding this comment. Why 'type -a' vs just type? It feels that using the '-a' option adds more noise than is necessary and could be misleading to someone trying to troubleshoot.
Author
There was a problem hiding this comment. I am surprised I did not redirect stderr to /dev/null here. The |
||
| echo "running detect: ${javacmd[*]@Q} ${loggable_script_args[*]@Q}" >&2 | ||
| "${javacmd[@]}" "${script_args[@]}" || return $? | ||
|
There was a problem hiding this comment. Is it a valid condition to have special characters within these 2 variables which require the need to print them with '@q'?
Author
There was a problem hiding this comment. The https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html |
||
| } | ||
|
|
||
| run | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of the edits with redirects to stderr in here are info type of messages, not errors. My opinion is that they should be sent to stdout.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for stipulating that. I dropped the ball after seeing no change in production concerning the bug itself (as opposed to following the diagnostic conventions).