fix basename: illegal option -- b issue with upstream filenames starting with - #17143
Conversation
This file contains 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
openshift-ci-robot
added
needs-ok-to-test
|
sorry for the re-submit pr for confuse. but it do a wrong swap for my repo master branch, it let original pr is removed. so i have to re-pr the patch. |
|
Can you please paste your full path so we can determine what part of the thing is being interpreted as a flag. I cannot reproduce this locally unless I create a filename that starts with a |
xiaods
changed the title
i am follow CONTRIBUTING.adoc +140 line it raised error above in desc. |
|
Could you please paste your full path? |
|
in my gopath: |
|
Please, your FULL path -- what is |
|
|
@xiaods could you please run: |
|
sorry for late response. @stevekuznetsov |
|
it output |
|
That's very interesting. Could you change this patch to instead detect when |
hack/lib/init.sh
Outdated
| @@ -51,7 +51,7 @@ os::log::stacktrace::install | |||
| os::util::environment::update_path_var | |||
|
|
|||
| if [[ -z "${OS_TMP_ENV_SET-}" ]]; then | |||
| os::util::environment::setup_tmpdir_vars "$( basename "$0" ".sh" )" | |||
| os::util::environment::setup_tmpdir_vars "$( basename -- "$0" ".sh" )" | |||
There was a problem hiding this comment.
Maybe we should do:
if [[ "$0" ~= *.sh ]]; then
os::util::environment::setup_tmpdir_vars "$( basename "$0" ".sh" )"
else
os::util::environment::setup_tmpdir_vars "shell"
fiThe intent here was not to create a dir for the name of your shell
|
also report error: |
|
You'll want to trace the error -- I would not expect $ [[ "-bash" == *.sh ]] && echo matches
$ [[ "ba.sh" == *.sh ]] && echo matches
matches |
|
@stevekuznetsov finally fix it. please have a look the patch |
hack/lib/init.sh
Outdated
| @@ -50,8 +50,10 @@ os::log::stacktrace::install | |||
| # them before every invocation. | |||
| os::util::environment::update_path_var | |||
|
|
|||
| if [[ -z "${OS_TMP_ENV_SET-}" ]]; then | |||
There was a problem hiding this comment.
We still want this condition as the top-level if
hack/lib/init.sh
Outdated
| @@ -50,8 +50,10 @@ os::log::stacktrace::install | |||
| # them before every invocation. | |||
| os::util::environment::update_path_var | |||
|
|
|||
| if [[ -z "${OS_TMP_ENV_SET-}" ]]; then | |||
| os::util::environment::setup_tmpdir_vars "$( basename "$0" ".sh" )" | |||
| if [[ -z "${OS_TMP_ENV_SET-}" ]] && [[ "$0" =~ *.sh ]]; then | |||
There was a problem hiding this comment.
Hmm I think in this case we are still not having the same logic -- would want:
if [[ -z "${OS_TMP_ENV_SET-}" ]]; then
if [[ "$0" =~ *.sh ]]; then
os::util::environment::setup_tmpdir_vars "$( basename "$0" ".sh" )"
else
os::util::environment::setup_tmpdir_vars "shell"
fi
fiThere was a problem hiding this comment.
thanks @stevekuznetsov , i have been done.
…ing with -
issue:
```
xiaods at XiaoTommydeMacBook-Pro in ~/go/src/github.com/openshift/origin on devel*
$ export PATH="${PATH}:$( source hack/lib/init.sh; echo "${OS_OUTPUT_BINPATH}/$( os::build::host_platform )/" )"
basename: illegal option -- b
usage: basename string [suffix]
basename [-a] [-s suffix] string [...]
```
caused by :
The -- (dash dash) stops basename from processing any options in the argument.
Always quote $0 in case there are spaces in the name.
|
/ok-to-test Thanks @xiaods |
openshift-ci-robot
added
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: stevekuznetsov, xiaods The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
openshift-merge-robot
added
the
approved
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/test all [submit-queue is verifying that this PR is safe to merge] |
|
@xiaods: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
Automatic merge from submit-queue (batch tested with PRs 17476, 17143, 15115, 17094, 17500). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
issue:
caused by :
The -- (dash dash) stops basename from processing any options in the argument.
Always quote $0 in case there are spaces in the name.