From 174eb66b568ca0bad1058552402b0d7482632234 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Nov 2016 17:54:38 +1100 Subject: [PATCH] Remove all eval usage --- ascii/distro/alpine | 22 ++++++++++----------- ascii/distro/android | 2 -- ascii/distro/antergos | 18 ++++++++--------- ascii/distro/arch | 33 ++++++++++++++----------------- ascii/distro/arch_small | 15 +++++++------- ascii/distro/bitrig | 12 +++++------- ascii/distro/blag | 4 +--- ascii/distro/blankon | 24 +++++++++++------------ ascii/distro/bunsenlabs | 18 ++++++++--------- ascii/distro/centos | 40 ++++++++++++++++++-------------------- ascii/distro/chakra | 38 +++++++++++++++++------------------- ascii/distro/chapeau | 12 +++++------- ascii/distro/chrome | 38 +++++++++++++++++------------------- ascii/distro/crux | 3 --- ascii/distro/crux_small | 2 -- ascii/distro/debian | 36 ++++++++++++++++------------------ ascii/distro/deepin | 3 --- ascii/distro/devuan | 30 +++++++++++++--------------- ascii/distro/dracos | 24 +++++++++++------------ ascii/distro/dragonflybsd | 30 +++++++++++++--------------- ascii/distro/elementary | 2 -- ascii/distro/exherbo | 2 -- ascii/distro/fedora | 2 -- ascii/distro/freebsd | 22 ++++++++++----------- ascii/distro/frugalware | 26 ++++++++++++------------- ascii/distro/funtoo | 2 -- neofetch | 41 +++++++++++++++++++++++---------------- 27 files changed, 227 insertions(+), 274 deletions(-) diff --git a/ascii/distro/alpine b/ascii/distro/alpine index 38fab97f..8f9b8771 100644 --- a/ascii/distro/alpine +++ b/ascii/distro/alpine @@ -1,22 +1,20 @@ -"\ ${c1} .hddddddddddddddddddddddh. :dddddddddddddddddddddddddd: /dddddddddddddddddddddddddddd/ +dddddddddddddddddddddddddddddd+ - \`sdddddddddddddddddddddddddddddddds\` - \`ydddddddddddd++hdddddddddddddddddddy\` -.hddddddddddd+\` \`+ddddh:-sdddddddddddh. -hdddddddddd+\` \`+y: .sddddddddddh -ddddddddh+\` \`//\` \`.\` -sddddddddd -ddddddh+\` \`/hddh/\` \`:s- -sddddddd -ddddh+\` \`/+/dddddh/\` \`+s- -sddddd -ddd+\` \`/o\` :dddddddh/\` \`oy- .yddd + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd hdddyo+ohddyosdddddddddho+oydddy++ohdddh .hddddddddddddddddddddddddddddddddddddh. - \`yddddddddddddddddddddddddddddddddddy\` - \`sdddddddddddddddddddddddddddddddds\` + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` +dddddddddddddddddddddddddddddd+ /dddddddddddddddddddddddddddd/ :dddddddddddddddddddddddddd: .hddddddddddddddddddddddh. -" diff --git a/ascii/distro/android b/ascii/distro/android index ff6d4949..17e7ff30 100644 --- a/ascii/distro/android +++ b/ascii/distro/android @@ -1,4 +1,3 @@ -"\ ${c1} ╲ ▁▂▂▂▁ ╱ ▄███████▄ ▄██${c2} ${c1}███${c2} ${c1}██▄ @@ -12,4 +11,3 @@ ${c1} ╲ ▁▂▂▂▁ ╱ ███████████ ██ ██ ██ ██ -" diff --git a/ascii/distro/antergos b/ascii/distro/antergos index 99ae30c8..67d1197f 100644 --- a/ascii/distro/antergos +++ b/ascii/distro/antergos @@ -1,21 +1,19 @@ -"\ -${c1} \`.-/::/-\`\` +${c1} `.-/::/-`` .-/osssssssso/. :osyysssssssyyys+- - \`.+yyyysssssssssyyyyy+. - \`/syyyyyssssssssssyyyyys-\` - \`/yhyyyyysss${c2}++${c1}ssosyyyyhhy/\` + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c2}++${c1}ssosyyyyhhy/` .ohhhyyyys${c2}o++/+o${c1}so${c2}+${c1}syy${c2}+${c1}shhhho. .shhhhys${c2}oo++//+${c1}sss${c2}+++${c1}yyy${c2}+s${c1}hhhhs. -yhhhhs${c2}+++++++o${c1}ssso${c2}+++${c1}yyy${c2}s+o${c1}hhddy: -yddhhy${c2}o+++++o${c1}syyss${c2}++++${c1}yyy${c2}yooy${c1}hdddy- - .yddddhs${c2}o++o${c1}syyyyys${c2}+++++${c1}yyhh${c2}sos${c1}hddddy\` -\`odddddhyosyhyyyyyy${c2}++++++${c1}yhhhyosddddddo + .yddddhs${c2}o++o${c1}syyyyys${c2}+++++${c1}yyhh${c2}sos${c1}hddddy` +`odddddhyosyhyyyyyy${c2}++++++${c1}yhhhyosddddddo .dmdddddhhhhhhhyyyo${c2}+++++${c1}shhhhhohddddmmh. ddmmdddddhhhhhhhso${c2}++++++${c1}yhhhhhhdddddmmdy dmmmdddddddhhhyso${c2}++++++${c1}shhhhhddddddmmmmh -dmmmdddddddhhys${c2}o++++o${c1}shhhhdddddddmmmmd- .smmmmddddddddhhhhhhhhhdddddddddmmmms. - \`+ydmmmdddddddddddddddddddmmmmdy/. - \`.:+ooyyddddddddddddyyso+:.\` -" + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` diff --git a/ascii/distro/arch b/ascii/distro/arch index 7ebc6bb8..2227dd19 100644 --- a/ascii/distro/arch +++ b/ascii/distro/arch @@ -1,22 +1,19 @@ -"\ -${c1} -\` - .o+\` - \`ooo/ - \`+oooo: - \`+oooooo: +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: -+oooooo+: - \`/:-:++oooo+: - \`/++++/+++++++: - \`/++++++++++++++: - \`/+++o${c2}oooooooo${c1}oooo/\` - ./${c2}ooosssso++osssssso${c1}+\` -${c2} .oossssso-\`\`\`\`/ossssss+\` + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` + ./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` -osssssso. :ssssssso. :osssssss/ osssso+++. /ossssssss/ +ssssooo/- - \`/ossssso+/:- -:/+osssso+- - \`+sso+:-\` \`.-/+oso: - \`++:. \`-/+/ - .\` \`/ -" - + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ diff --git a/ascii/distro/arch_small b/ascii/distro/arch_small index aa5e0749..26757617 100644 --- a/ascii/distro/arch_small +++ b/ascii/distro/arch_small @@ -1,8 +1,7 @@ -''${c1}' /\\ - /^^\\ - /\\ \\ - /'${c2}' __ \\ - / ( ) \\ - / __| |__\\\\\ -/// \\\\\\\\\ -' +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ diff --git a/ascii/distro/bitrig b/ascii/distro/bitrig index 97b151ee..8daebf5f 100644 --- a/ascii/distro/bitrig +++ b/ascii/distro/bitrig @@ -1,7 +1,6 @@ -"\ -${c1} \`hMMMMN+ - -MMo-dMd\` - oMN- oMN\` +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` yMd /NM: .mMmyyhMMs :NMMMhsmMh @@ -9,12 +8,11 @@ ${c1} \`hMMMMN+ hMd.-hMNMN: mMmsssmMMMo .MMdyyhNMMMd - oMN.\`/dMddMN\` + oMN.`/dMddMN` yMm/hNm+./MM/ -.dMMMmo.\`\`.NMo +.dMMMmo.``.NMo :NMMMNmmmmmMMh /MN/-------oNN: hMd. .dMh sm/ /ms -" diff --git a/ascii/distro/blag b/ascii/distro/blag index be95e431..047444cc 100644 --- a/ascii/distro/blag +++ b/ascii/distro/blag @@ -1,4 +1,3 @@ -"\ ${c1} d ,MK: xMMMX: @@ -12,8 +11,7 @@ ${c1} d .:xNMMMMMMMMMMMMMMMMMK. lMMMMMMMMMMMMMMMMMMK. ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. \`':ldko + .NMMMMMNd. `':ldko OMMMK: oWk, ;: -" diff --git a/ascii/distro/blankon b/ascii/distro/blankon index c08ab849..43bbd786 100644 --- a/ascii/distro/blankon +++ b/ascii/distro/blankon @@ -1,19 +1,17 @@ -"\ -${c2} \`./ohdNMMMMNmho+.\` ${c1} .+oo:\` -${c2} -smMMMMMMMMMMMMMMMMmy-\` ${c1}\`yyyyy+ -${c2} \`:dMMMMMMMMMMMMMMMMMMMMMMd/\` ${c1}\`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}\`yyyyys -${c2} -mMMMMMMms-\` -omMMMMMMN-${c1}.yyyyys +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys ${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy \`sMMMMMMh${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys ${c2}NMMMMMN: .NMMMMMN${c1}yyyyys ${c2}MMMMMMm. NMMMMMN${c1}yyyyys ${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys ${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys ${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.\` \`.:ohNMMMMMMNo ${c1}\`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}\`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:\` ${c1}\`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}\`yyyyyo -${c2} \`.:/++++/:.\` ${c1}:oys+. -" +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. diff --git a/ascii/distro/bunsenlabs b/ascii/distro/bunsenlabs index d6c65955..93796823 100644 --- a/ascii/distro/bunsenlabs +++ b/ascii/distro/bunsenlabs @@ -1,22 +1,20 @@ -"\ -${c1} \`++ +${c1} `++ -yMMs - \`yMMMMN\` + `yMMMMN` -NMMMMMMm. :MMMMMMMMMN- .NMMMMMMMMMMM/ yMMMMMMMMMMMMM/ -\`MMMMMMNMMMMMMMN. +`MMMMMMNMMMMMMMN. -MMMMN+ /mMMMMMMy --MMMm\` \`dMMMMMM -\`MMN. .NMMMMM. - hMy yMMMMM\` +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` -Mo +MMMMN /o +MMMMs - +MMMN\` + +MMMN` hMMM: - \`NMM/ + `NMM/ +MN: mh. -/ -" diff --git a/ascii/distro/centos b/ascii/distro/centos index 0266f19d..e56aa5dd 100644 --- a/ascii/distro/centos +++ b/ascii/distro/centos @@ -1,21 +1,19 @@ -"\ -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' -" +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' diff --git a/ascii/distro/chakra b/ascii/distro/chakra index 2b2f6004..28227b92 100644 --- a/ascii/distro/chakra +++ b/ascii/distro/chakra @@ -1,20 +1,18 @@ -"\ -${c1} _ _ _ \"kkkkkkkk. - ,kkkkkkkk., \'kkkkkkkkk, - ,kkkkkkkkkkkk., \'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,\'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk\'kkkkkkk. - \"\'\'\"\'\'\',;::,,\"\'\'kkk\'\'kkkkk; __ - ,kkkkkkkkkk, \"k\'\'kkkkk\' ,kkkk - ,kkkkkkk\' ., \' .: \'kkkk\',kkkkkk - ,kkkkkkkk\'.k\' , ,kkkk;kkkkkkkkk - ,kkkkkkkk\';kk \'k \"\'k\',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.\'kkkkkkkkkkkkkkkkkk\' -;kkkkkkkk\'\'kkkkkk;\'kkkkkkkkkkkkk\'\' -\'kkkkkkk; \'kkkkkkkk.,\"\"\'\'\"\'\'\"\" - \'\'kkkk; \'kkkkkkkkkk., - \';\' \'kkkkkkkkkkkk., - ';kkkkkkkkkk\' - ';kkkkkk\' - \"\'\'\" -" +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" diff --git a/ascii/distro/chapeau b/ascii/distro/chapeau index d3e7b136..6107817c 100644 --- a/ascii/distro/chapeau +++ b/ascii/distro/chapeau @@ -1,4 +1,3 @@ -"\ ${c1} .-/-. ////////. ////////${c2}y+${c1}//. @@ -11,10 +10,9 @@ ${c1} .-/-. ///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// //////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// //////${c2}+MMmssssssssssssss+${c1}/////// -\`//////${c2}yMMy${c1}//////////////////// - \`//////${c2}smMNhso++oydNm${c1}//////// - \`///////${c2}ohmNMMMNNdy+${c1}/////// - \`//////////${c2}++${c1}////////// - \`////////////////. +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. -////////- -" diff --git a/ascii/distro/chrome b/ascii/distro/chrome index 6ad3f5fd..951bf190 100644 --- a/ascii/distro/chrome +++ b/ascii/distro/chrome @@ -1,20 +1,18 @@ -"\ -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1} .ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1} :oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1} lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1} lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1} ;cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1} .ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. -" +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. diff --git a/ascii/distro/crux b/ascii/distro/crux index f1640f50..b5af7baa 100644 --- a/ascii/distro/crux +++ b/ascii/distro/crux @@ -1,4 +1,3 @@ -"\ ${c1} odddd oddxkkkxxdoo ddcoddxxxdoool @@ -17,5 +16,3 @@ ${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l ${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd ${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo -" - diff --git a/ascii/distro/crux_small b/ascii/distro/crux_small index 022d08c6..4b64001d 100644 --- a/ascii/distro/crux_small +++ b/ascii/distro/crux_small @@ -1,4 +1,3 @@ -"\ ${c1} ___ (${c3}.· ${c1}| (${c2}<> ${c1}| @@ -6,4 +5,3 @@ ${c1} ___ ( ${c3}/ \\ ${c1}/| ${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) ${c2}\/${c1}-____${c2}\/ -" diff --git a/ascii/distro/debian b/ascii/distro/debian index 1f0b44a9..df88d079 100644 --- a/ascii/distro/debian +++ b/ascii/distro/debian @@ -1,19 +1,17 @@ -"\ -${c2} _,met\$\$\$\$\$gg. - ,g\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$P. - ,g\$\$P\"\ \"\"\"Y\$\$.\". - ,\$\$P' \`\$\$\$. -',\$\$P ,ggs. \`\$\$b: -\`d\$\$' ,\$P\"\' ${c1}.${c2} \$\$\$ - \$\$P d\$\' ${c1},${c2} \$\$P - \$\$: \$\$. ${c1}-${c2} ,d\$\$' - \$\$\; Y\$b._ _,d\$P' - Y\$\$. ${c1}\`.${c2}\`\"Y\$\$\$\$P\"' -${c2} \`\$\$b ${c1}\"-.__ -${c2} \`Y\$\$ - \`Y\$\$. - \`\$\$b. - \`Y\$\$b. - \`\"Y\$b._ - \`\"\"\"\ -" +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" diff --git a/ascii/distro/deepin b/ascii/distro/deepin index 6ec53548..a44f4dad 100644 --- a/ascii/distro/deepin +++ b/ascii/distro/deepin @@ -1,4 +1,3 @@ -"\ ${c1} ............ .';;;;;. .,;,. .,;;;;;;;. ';;;;;;;. @@ -17,5 +16,3 @@ ${c1} ............ ,dkkkkkkkkkkkkko;. .;o; .;okkkkkdl;. .,cl:. .,:cccccccc:,. -" - diff --git a/ascii/distro/devuan b/ascii/distro/devuan index 7fcabb16..4173782f 100644 --- a/ascii/distro/devuan +++ b/ascii/distro/devuan @@ -1,17 +1,15 @@ -"\ ${c1} ..,,;;;::;,.. - \`':ddd;:,. - \`'dPPd:,. - \`:b\$\$b\`. - 'P\$\$\$d\` - .\$\$\$\$\$\` - ;\$\$\$\$\$P - .:P\$\$\$\$\$\$\` - .,:b\$\$\$\$\$\$\$;' - .,:dP\$\$\$\$\$\$\$\$b:' - .,:;db\$\$\$\$\$\$\$\$\$\$Pd'\` - ,db\$\$\$\$\$\$\$\$\$\$\$\$\$\$b:'\` -:\$\$\$\$\$\$\$\$\$\$\$\$b:'\` - \`\$\$\$\$\$bd:''\` - \`'''\` -" + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` diff --git a/ascii/distro/dracos b/ascii/distro/dracos index 4fda8ecc..3eb2a70b 100644 --- a/ascii/distro/dracos +++ b/ascii/distro/dracos @@ -1,15 +1,13 @@ -"\ -${c1} \`-:/- +${c1} `-:/- -os: - -os/\` - :sy+-\` - \`/yyyy+. - \`+yyyyo- - \`/yyyys: -\`:osssoooo++- +yyyyyy/\` - ./yyyyyyo yo\`:syyyy+. + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. -oyyy+ +- :yyyyyo- - \`:sy: \`. \`/yyyyys: - ./o/.\` .oyyso+oo:\` - :+oo+//::::///:-.\` \`.\` -" + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` diff --git a/ascii/distro/dragonflybsd b/ascii/distro/dragonflybsd index d3d352ac..3276d4f0 100644 --- a/ascii/distro/dragonflybsd +++ b/ascii/distro/dragonflybsd @@ -1,20 +1,18 @@ -"\ ${c1} | .-. ${c3} ()${c1}I${c3}() - ${c1} \"==.__:-:__.==\" - \"==.__/~|~\__.==\" - \"==._( Y )_.==\" - ${c2}.-'~~\"\"~=--...,__${c1}\/|\/${c2}__,...--=~\"\"~~'-. -( ..=${c1}\\\\=${c1}/${c2}=.. ) - \`'-. ,.-\"\`;${c1}/=\\\\${c2} ;\"-.,_ .-'\` - \`~\"-=-~\` .-~\` ${c1}|=|${c2} \`~-. \`~-=-\"~\` - .-~\` /${c1}|=|${c2}\ \`~-. - .~\` / ${c1}|=|${c2} \ \`~. - .-~\` .' ${c1}|=|${c2} \\\\\`. \`~-. - (\` _,.-=\"\` ${c1} |=|${c2} \`\"=-.,_ \`) - \`~\"~\"\` ${c1} |=|${c2} \`\"~\"~\` - ${c1} /=\\\\ - \\\=/ + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ ^ -" diff --git a/ascii/distro/elementary b/ascii/distro/elementary index cb6df641..8614c746 100644 --- a/ascii/distro/elementary +++ b/ascii/distro/elementary @@ -1,4 +1,3 @@ -"\ ${c2} eeeeeeeeeeeeeeeee eeeeeeeeeeeeeeeeeeeeeee eeeee eeeeeeeeeeee eeeee @@ -16,4 +15,3 @@ eee eeeeeeeeee eeeeee eee eeeee eeeee eeeeeee eeeeeee eeeeeeeeeeeeeeeee -" diff --git a/ascii/distro/exherbo b/ascii/distro/exherbo index b5f58482..edacf81a 100644 --- a/ascii/distro/exherbo +++ b/ascii/distro/exherbo @@ -1,4 +1,3 @@ -"\ ${c2} , OXo. NXdX0: .cok0KXNNXXK0ko:. @@ -21,4 +20,3 @@ KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... 'dXMMXkl;,. .,o0MMNo' ':d0XWMMMMWNNNNMMMNOl' ':okKXWNKkl' -" diff --git a/ascii/distro/fedora b/ascii/distro/fedora index edc78240..f0ba391b 100644 --- a/ascii/distro/fedora +++ b/ascii/distro/fedora @@ -1,4 +1,3 @@ -"\ ${c1} /:-------------:\\ :-------------------:: :-----------${c2}/shhOHbmp${c1}---:\\ @@ -16,4 +15,3 @@ ${c1} /:-------------:\\ :---${c2}:sdNMMMMNds:${c1}------------: :------${c2}:://:${c1}-------------:: :---------------------:// -" diff --git a/ascii/distro/freebsd b/ascii/distro/freebsd index 2373fcd5..6ef67782 100644 --- a/ascii/distro/freebsd +++ b/ascii/distro/freebsd @@ -1,17 +1,15 @@ -"\ - ${c2}\`\`\` ${c1}\` - ${c2}\` \`.....---...${c1}....--.\`\`\` -/ - ${c2}+o .--\` ${c1}/y:\` +. - ${c2} yo\`:. ${c1}:o \`+- - ${c2}y/ ${c1}-/\` -o/ + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}\`-- / - ${c2}\`: ${c1}:\` - ${c2}\`: ${c1}:\` + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` ${c2}/ ${c1}/ ${c2}.- ${c1}-. ${c2}-- ${c1}-. - ${c2}\`:\` ${c1}\`:\` - .-- \`--. + ${c2}`:` ${c1}`:` + .-- `--. .---.....----. -" diff --git a/ascii/distro/frugalware b/ascii/distro/frugalware index 64eaf025..b11961ba 100644 --- a/ascii/distro/frugalware +++ b/ascii/distro/frugalware @@ -1,25 +1,23 @@ -"\ -${c1} \`++/::-.\` - /o+++++++++/::-.\` - \`o+++++++++++++++o++/::-.\` - /+++++++++++++++++++++++oo++/:-.\`\` - .o+ooooooooooooooooooosssssssso++oo++/:-\` +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s\` + -o+ssoooooooooooosssssssssssssyyo+++++++s` o++ssoooooo++++++++++++++sssyyyyo++++++o: :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - \`o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy\` + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ -ysooooooydhhhhhhhhhhhddddddddddddddddssy .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - \`\`.-/+oosysssssssssssssssssssssss - \`\`.:/+osyysssssssssssssh. - \`-:/+osyyssssyo - .-:+++\` -" + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` diff --git a/ascii/distro/funtoo b/ascii/distro/funtoo index ce5719e6..13079091 100644 --- a/ascii/distro/funtoo +++ b/ascii/distro/funtoo @@ -1,4 +1,3 @@ -"\ ${c2} _______ ____ /MMMMMMM/ /MMMM| _____ _____ __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ @@ -10,4 +9,3 @@ ${c2} _______ ____ |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ -" diff --git a/neofetch b/neofetch index 84afcd1f..b7ac9194 100755 --- a/neofetch +++ b/neofetch @@ -2002,25 +2002,28 @@ getascii() { fi fi - # Eval colors - print="$(eval printf "$(<"$ascii")")" + # Turn file into variable + while IFS=$'\n' read -r line 2>/dev/null; do + print+="${line} \n" + + # Calculate size of ascii file in line length / line count. + line="${line//\$\{??\}}" + line="${line//'\\'/'\'}" + [[ "${#line}" -gt "${ascii_length:-0}" ]] && ascii_length="${#line}" + lines="$((lines+=1))" + done < "$ascii" + + # Colors + print="${print//'${c1}'/$c1}" + print="${print//'${c2}'/$c2}" + print="${print//'${c3}'/$c3}" + print="${print//'${c4}'/$c4}" + print="${print//'${c5}'/$c5}" + print="${print//'${c6}'/$c6}" # Set locale to get correct padding export LC_ALL="$SYS_LOCALE" - # Turn the file into a variable and strip escape codes. - ascii_strip="$(<"$ascii")" - ascii_strip="${ascii_strip//\$\{??\}}" - ascii_strip="${ascii_strip//'\\'/ }" - ascii_strip="${ascii_strip//'\'}" - - # Get lines/columns of the ascii file. - lines=1 - while IFS=$'\n' read -r line 2>/dev/null; do - [[ "${#line}" -gt "${ascii_length:-0}" ]] && ascii_length="${#line}" - lines="$((lines+=1))" - done <<< "$ascii_strip" - # Overwrite padding if ascii_length_force is set. [[ "$ascii_length_force" ]] && ascii_length="$ascii_length_force" @@ -2086,7 +2089,7 @@ getimage() { [[ "$image_backend" != "iterm2" ]]; then current_window="$(xdotool getactivewindow)" - eval "$(xdotool getwindowgeometry --shell "$current_window")" + source <(xdotool getwindowgeometry --shell "$current_window") term_height="$HEIGHT" term_width="$WIDTH" @@ -2518,6 +2521,10 @@ colors() { setcolors 4 8 ;; + "BunsenLabs"*) + setcolors 8 7 + ;; + *"OS X"* | *"iOS"* | "Mac" | *"macOS"*) setcolors 2 3 1 1 5 4 ascii_distro="mac" @@ -3307,7 +3314,7 @@ main() { displayimage # Set cursor position next to ascii art - printf "\033[$((${lines:-4} - ${prompt_loc:-4}))A" + printf "\033[$((${lines:-0} - ${prompt_loc:-0}))A" # Reset horizontal cursor position printf "\033[9999999D"