Fix distfile basename in staging script #508
Merged
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
Before this change, the basename would always be generated to contain the string `.exe`. This fixes the script in a shellcheck-compliant way so that we're back to the old behaviour. It also fixes the error introduced by the `u` flag in `set -euo pipefail` when the script is invoked without a `label` or set `SKIPBUILD` so that those fall back to an empty default value.
bentranter
changed the title
hilary
approved these changes
Jul 22, 2019
| @@ -52,7 +52,7 @@ fi | |||
| cd "$RELEASE_DIR" | |||
|
|
|||
| for f in "$STAGE_DIR"/*; do | |||
| distfile_basename=$(basename "${f}%.exe") | |||
| distfile_basename=$(basename "${f%".exe"}") | |||
There was a problem hiding this comment.
Doh! That's what I get for continuing to code when frustrated...
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.
Before this change, the basename would always be generated to contain the string
.exe. This fixes the script in a shellcheck-compliant way so that we're back to the old behaviour.It also fixes the error introduced by the
uflag inset -euo pipefailwhen the script is invoked without alabelor setSKIPBUILDso that those fall back to an empty default value.