Remove unnecessary braces.

This commit is contained in:
Andrew Janke 2015-02-21 16:00:40 -05:00
parent 187cf07c91
commit cb37c934c0
1 changed files with 21 additions and 23 deletions

View File

@ -63,33 +63,31 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
# Outputs the encoded string on stdout
# Returns nonzero if encoding failed
function _omz_urlencode() {
local str=$1
local url_str=''
{
local str=$1
# URLs must use UTF-8 encoding; convert if required
local encoding=${LC_CTYPE/*./}
if [[ -n $encoding && $encoding != UTF-8 ]]; then
str=$(iconv -f $encoding -t UTF-8)
if [[ $? != 0 ]]; then
echo "Error converting string from $encoding to UTF-8" >&2
return 1
fi
# URLs must use UTF-8 encoding; convert if required
local encoding=${LC_CTYPE/*./}
if [[ -n $encoding && $encoding != UTF-8 ]]; then
str=$(iconv -f $encoding -t UTF-8)
if [[ $? != 0 ]]; then
echo "Error converting string from $encoding to UTF-8" >&2
return 1
fi
fi
# Use LC_CTYPE=C to process text byte-by-byte
local i ch hexch LC_CTYPE=C
for ((i = 1; i <= ${#str}; ++i)); do
ch="$str[i]"
if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
url_str+="$ch"
else
hexch=$(printf "%02X" "'$ch")
url_str+="%$hexch"
fi
done
echo $url_str
}
# Use LC_CTYPE=C to process text byte-by-byte
local i ch hexch LC_CTYPE=C
for ((i = 1; i <= ${#str}; ++i)); do
ch="$str[i]"
if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
url_str+="$ch"
else
hexch=$(printf "%02X" "'$ch")
url_str+="%$hexch"
fi
done
echo $url_str
}
# Emits the control sequence to notify Terminal.app of the cwd