mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-06-07 15:27:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail redirections if noclobber is set

Browse Source 
Using the '>|' syntax for shell redirections instead of '>' forces an
overwrite even if the noclobber option is set.
This commit is contained in:
Jan Larres
2020-04-16 19:30:31 +12:00
committed by Marco Vermeulen
parent 761ea99763
commit 708c121f83
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/bash/sdkman-install.sh
View File

@@ -129,7 +129,7 @@ function __sdkman_download() {
# pre-installation hook: implements function __sdkman_pre_installation_hook
local pre_installation_hook="${SDKMAN_DIR}/tmp/hook_pre_${candidate}_${version}.sh"
__sdkman_echo_debug "Get pre-installation hook: ${SDKMAN_CANDIDATES_API}/hooks/pre/${candidate}/${version}/${platform_parameter}"
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/pre/${candidate}/${version}/${platform_parameter}" > "$pre_installation_hook"
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/pre/${candidate}/${version}/${platform_parameter}" >| "$pre_installation_hook"
__sdkman_echo_debug "Copy remote pre-installation hook: $pre_installation_hook"
source "$pre_installation_hook"
__sdkman_pre_installation_hook || return 1
@@ -152,7 +152,7 @@ function __sdkman_download() {
# responsible for taking `binary_input` and producing `zip_output`
local post_installation_hook="${SDKMAN_DIR}/tmp/hook_post_${candidate}_${version}.sh"
__sdkman_echo_debug "Get post-installation hook: ${SDKMAN_CANDIDATES_API}/hooks/post/${candidate}/${version}/${platform_parameter}"
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/post/${candidate}/${version}/${platform_parameter}" > "$post_installation_hook"
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/post/${candidate}/${version}/${platform_parameter}" >| "$post_installation_hook"
__sdkman_echo_debug "Copy remote post-installation hook: ${post_installation_hook}"
source "$post_installation_hook"
__sdkman_post_installation_hook || return 1

6
src/main/bash/sdkman-update.sh
View File

@@ -44,7 +44,7 @@ function __sdk_update() {
# legacy bash workaround
if [[ "$bash_shell" == 'true' && "$BASH_VERSINFO" -lt 4 ]]; then
__sdkman_legacy_bash_message
echo "$fresh_candidates_csv" > "$SDKMAN_CANDIDATES_CACHE"
echo "$fresh_candidates_csv" >| "$SDKMAN_CANDIDATES_CACHE"
return 0
fi
@@ -56,13 +56,13 @@ function __sdk_update() {
if (( fresh_candidates_length > cached_candidates_length )); then
echo ""
__sdkman_echo_green "Adding new candidates(s): $diff_candidates"
echo "$fresh_candidates_csv" > "$SDKMAN_CANDIDATES_CACHE"
echo "$fresh_candidates_csv" >| "$SDKMAN_CANDIDATES_CACHE"
echo ""
__sdkman_echo_yellow "Please open a new terminal now..."
elif (( fresh_candidates_length < cached_candidates_length )); then
echo ""
__sdkman_echo_green "Removing obsolete candidates(s): $diff_candidates"
echo "$fresh_candidates_csv" > "$SDKMAN_CANDIDATES_CACHE"
echo "$fresh_candidates_csv" >| "$SDKMAN_CANDIDATES_CACHE"
echo ""
__sdkman_echo_yellow "Please open a new terminal now..."
else

2
src/test/groovy/sdkman/env/BashEnv.groovy vendored
View File

@@ -46,7 +46,7 @@ class BashEnv {
* Starts the external bash process.
*/
void start() {
process = ["bash", "--noprofile", "--norc", "-i"].execute(env, workDir)
process = ["bash", "--noprofile", "--norc", "-i", "-o", "noclobber"].execute(env, workDir)
consumeProcessStream(process.inputStream)
consumeProcessStream(process.errorStream)