Skip to content

Commit 24089bd

Browse files
committed
refactor: keep using POSIX compatible tr arguments in other shells
1 parent 6820bcd commit 24089bd

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed

β€Ždist/ColorEcho.bashβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2518,5 +2518,5 @@ function echo.Rainbow() {
25182518
if command -v lolcat > /dev/null 2>&1; then echo "$*" | lolcat; else echo "$*"; fi
25192519
}
25202520
function echo.Reset() {
2521-
echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
2521+
echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
25222522
}

β€Ždist/ColorEcho.fishβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2518,5 +2518,5 @@ function echo.Rainbow
25182518
if command -v lolcat > /dev/null; echo "$argv" | lolcat; else; echo "$argv"; end
25192519
end
25202520
function echo.Reset
2521-
echo "$argv" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
2521+
echo "$argv" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
25222522
end

β€Ždist/ColorEcho.kshβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2518,5 +2518,5 @@ function echoRainbow {
25182518
if command -v lolcat 2> /dev/null >&2; then echo "$*" | lolcat; else echo "$*"; fi
25192519
}
25202520
function echoReset {
2521-
echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
2521+
echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
25222522
}

β€Ždist/ColorEcho.shβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2525,5 +2525,5 @@ echoRainbow() {
25252525
if command -v lolcat > /dev/null 2>&1; then echo "$*" | lolcat; else echo "$*"; fi
25262526
}
25272527
echoReset() {
2528-
echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
2528+
echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
25292529
}

β€Ždist/ColorEcho.tcshβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,4 +1267,4 @@ alias echo.LightSTULBrown 'echo "\033[9;4;9;38;5;52m\!*\033[m"'
12671267

12681268
alias echo.LightSTBLBrown 'echo "\033[9;5;9;38;5;52m\!*\033[m"'
12691269
alias echo.Rainbow 'which lolcat >& /dev/null && echo "\!*" | lolcat || echo "\!*"'
1270-
alias echo.Reset 'echo "\!*" | tr -d \[\:cntrl\:\] | sed -E "s/\[((;)?[0-9]{1,3}){0,3}m//g" | xargs'
1270+
alias echo.Reset 'echo "\!*" | tr -d \\x27\[:cntrl:\]\\x27 | sed -E "s/\[((;)?[0-9]{1,3}){0,3}m//g" | xargs'

β€Ždist/ColorEcho.zshβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2518,5 +2518,5 @@ function echo.Rainbow() {
25182518
if command -v lolcat > /dev/null 2>&1; then echo "$*" | lolcat; else echo "$*"; fi
25192519
}
25202520
function echo.Reset() {
2521-
echo "$*" | tr -d \[\:cntrl\:\] | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
2521+
echo "$*" | tr -d '[:cntrl:]' | sed -E "s/\\[((;)?[0-9]{1,3}){0,3}m//g" | xargs
25222522
}

β€Žgenerator.shβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,20 @@ SH_ECHO
213213
case "${shell}" in
214214
"fish")
215215
ifCond='command -v lolcat > /dev/null'
216+
trCntrl="'[:cntrl:]'"
216217
;;
217218
"ksh")
218219
ifCond='command -v lolcat 2> /dev/null >&2'
220+
trCntrl="'[:cntrl:]'"
219221
;;
220222
"tcsh")
221223
ifCond='which lolcat >& /dev/null'
224+
# tcsh uses aliases instead of functions -> replace ', [ and ] with quoted chars
225+
trCntrl='\\x27\[:cntrl:\]\\x27'
222226
;;
223227
*)
224228
ifCond='command -v lolcat > /dev/null 2>&1'
229+
trCntrl="'[:cntrl:]'"
225230
;;
226231
esac
227232

@@ -232,7 +237,7 @@ LOLCAT
232237
# echo.Reset to remove color code on output
233238
fnName="${fn}echo${dot}Reset${brackets}"
234239
cat << RESET >> "${tempDist}"
235-
${fnName}${startSym}echo "${para}" | tr -d \[\:cntrl\:\] | sed -E "s/${escape//\//\/\/}[((;)?[0-9]{1,3}){0,3}m//g" | xargs${endSym}
240+
${fnName}${startSym}echo "${para}" | tr -d ${trCntrl} | sed -E "s/${escape//\//\/\/}[((;)?[0-9]{1,3}){0,3}m//g" | xargs${endSym}
236241
RESET
237242
mv -f "${tempDist}" "${newDist}"
238243
} &

0 commit comments

Comments
Β (0)