1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-26 10:13:37 +08:00

Add support for variant "utf8" locale suffix spelling. Fix dumb bug in iconv call that would cause it to hang.

This commit is contained in:
Andrew Janke 2015-02-21 16:25:28 -05:00
parent cb37c934c0
commit 88f42b6132

View File

@ -64,12 +64,12 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
# Returns nonzero if encoding failed
function _omz_urlencode() {
local str=$1
local url_str=''
local url_str=""
# 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 [[ -n $encoding && $encoding != UTF-8 && $encoding != utf8 ]]; then
str=$(echo $str | iconv -f $encoding -t UTF-8)
if [[ $? != 0 ]]; then
echo "Error converting string from $encoding to UTF-8" >&2
return 1