mirror of
https://github.com/sdkman/sdkman-cli.git
synced 2026-04-19 22:47:06 -04:00
Remove unnecessary quoting
This commit is contained in:
committed by
Marco Vermeulen
parent
f1b4a61606
commit
d10dfd47ad
@@ -17,15 +17,15 @@
|
||||
#
|
||||
|
||||
function __sdk_env() {
|
||||
SDKMANRC=".sdkmanrc"
|
||||
SDKMANRC=.sdkmanrc
|
||||
|
||||
if [[ "$1" == "init" ]]; then
|
||||
if [[ $1 == init ]]; then
|
||||
__sdkman_generate_sdkmanrc
|
||||
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ ! -f "$SDKMANRC" ]]; then
|
||||
if [[ ! -f $SDKMANRC ]]; then
|
||||
__sdkman_echo_red "Could not find $SDKMANRC in the current directory."
|
||||
echo ""
|
||||
__sdkman_echo_yellow "Run 'sdk env init' to create it."
|
||||
@@ -35,7 +35,7 @@ function __sdk_env() {
|
||||
|
||||
while IFS= read -r line || [[ -n "$line" ]]; do
|
||||
local normalised_line
|
||||
normalised_line="$(__sdkman_normalise "$line")"
|
||||
normalised_line=$(__sdkman_normalise "$line")
|
||||
|
||||
__sdkman_is_blank_line "$normalised_line" && continue
|
||||
|
||||
@@ -52,16 +52,16 @@ function __sdk_env() {
|
||||
}
|
||||
|
||||
function __sdkman_generate_sdkmanrc() {
|
||||
if [[ -f "$SDKMANRC" ]]; then
|
||||
if [[ -f $SDKMANRC ]]; then
|
||||
__sdkman_echo_red "$SDKMANRC already exists!"
|
||||
|
||||
return 1
|
||||
fi
|
||||
|
||||
__sdkman_determine_current_version "java"
|
||||
__sdkman_determine_current_version 'java'
|
||||
|
||||
local version
|
||||
[[ -n "$CURRENT" ]] && version="$CURRENT" || version="$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/default/java")"
|
||||
[[ -n $CURRENT ]] && version=$CURRENT || version=$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/default/java")
|
||||
|
||||
echo "java=$version" > "$SDKMANRC"
|
||||
|
||||
@@ -69,15 +69,15 @@ function __sdkman_generate_sdkmanrc() {
|
||||
}
|
||||
|
||||
function __sdkman_is_blank_line() {
|
||||
[[ -z "$1" ]]
|
||||
[[ -z $1 ]]
|
||||
}
|
||||
|
||||
function __sdkman_normalise() {
|
||||
local line_without_comments="${1/\#*/}"
|
||||
local line_without_comments=${1/\#*/}
|
||||
|
||||
echo "${line_without_comments//[[:space:]]/}"
|
||||
}
|
||||
|
||||
function __sdkman_matches_candidate_format() {
|
||||
[[ "$1" =~ ^[[:lower:]]+\=.+$ ]]
|
||||
[[ $1 =~ ^[[:lower:]]+\=.+$ ]]
|
||||
}
|
||||
Reference in New Issue
Block a user