From 174eb66b568ca0bad1058552402b0d7482632234 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Nov 2016 17:54:38 +1100 Subject: [PATCH 1/4] 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" From 7124cdf509ff6e3a520878c25bdcfb332153bebc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Nov 2016 18:11:51 +1100 Subject: [PATCH 2/4] Ascii: Convert more ascii --- ascii/distro/galliumos | 2 -- ascii/distro/gentoo | 24 +++++++++++------------- ascii/distro/gentoo_small | 2 -- ascii/distro/gnewsense | 12 +++++------- ascii/distro/guixsd | 22 ++++++++++------------ ascii/distro/haiku | 2 -- ascii/distro/kali | 2 -- ascii/distro/kaos | 2 -- ascii/distro/kde | 3 +-- ascii/distro/kogaion | 2 -- 10 files changed, 27 insertions(+), 46 deletions(-) diff --git a/ascii/distro/galliumos b/ascii/distro/galliumos index 1ec59af2..ae9681d5 100644 --- a/ascii/distro/galliumos +++ b/ascii/distro/galliumos @@ -1,4 +1,3 @@ -"\ ${c1}sooooooooooooooooooooooooooooooooooooo+: yyooooooooooooooooooooooooooooooooo+/::: yyysoooooooooooooooooooooooooooo+/:::::: @@ -18,4 +17,3 @@ yyyyyyyyyo+:-.....................-//::: yyyyyyo+:-..........................://: yyyo+:-..............................-// o/:-...................................: -" diff --git a/ascii/distro/gentoo b/ascii/distro/gentoo index 502ee4c9..3bec6daa 100644 --- a/ascii/distro/gentoo +++ b/ascii/distro/gentoo @@ -1,20 +1,18 @@ -"\ ${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-\` + -o${c2}dNMMMMMMMMNNmhy+${c1}-` -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - \`o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/\` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o\` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+\` + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - \`o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+\` - \`s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:\` + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` +M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-\` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-\` -\`/${c2}ohdmmddhys+++/:${c1}.\` - \`-//////:--. -" +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. diff --git a/ascii/distro/gentoo_small b/ascii/distro/gentoo_small index 00358d67..a1e7a0ba 100644 --- a/ascii/distro/gentoo_small +++ b/ascii/distro/gentoo_small @@ -1,4 +1,3 @@ -"\ ${c1} _-----_ ( \\ \ 0 \\ @@ -6,4 +5,3 @@ ${c2} \ ) / _/ ( _- \____- -" diff --git a/ascii/distro/gnewsense b/ascii/distro/gnewsense index 60a80f70..b98b859b 100644 --- a/ascii/distro/gnewsense +++ b/ascii/distro/gnewsense @@ -1,14 +1,12 @@ -"\ ${c1} ..,,,,.. .oocchhhhhhhhhhccoo. .ochhlllllllc hhhhhh ollllllhhco. ochlllllllllll hhhllllllhhh lllllllllllhco .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco\'\' hlllllo +hllh \`\`ochllllllllllo -hllllllllc\' hllllllllllllh \`cllllllllh +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh ollllllh +llllllllllll+ hllllllo - \`cllllh. ohllllllho .hllllc\' + `cllllh. ohllllllho .hllllc' ochllc. ++++ .cllhco - \`+occooo+. .+ooocco+\' - \`+oo++++ ++++oo+\' -" + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' diff --git a/ascii/distro/guixsd b/ascii/distro/guixsd index 0cdf7470..6d6345ec 100644 --- a/ascii/distro/guixsd +++ b/ascii/distro/guixsd @@ -1,12 +1,10 @@ -"\ -${c1} .. \`. - \`--..\`\`\`..\` \`..\`\`\`..--\` - .-:///-:::. \`-:::///:-. - \`\`\`\`.:::\` \`:::.\`\`\`\` - -//:\` -::- - ://: -::- - \`///- .:::\` - -+++-:::. - :+/:::- - \`-....\` -" +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` diff --git a/ascii/distro/haiku b/ascii/distro/haiku index d0926c5d..56a7feb4 100644 --- a/ascii/distro/haiku +++ b/ascii/distro/haiku @@ -1,4 +1,3 @@ -"\ ${c2} :dc' 'l:;'${c1},${c2}'ck. .;dc:. co ${c1}..${c2}k. .;; ':o. @@ -16,4 +15,3 @@ ${c2} :dc' cd,.${c1}....:${c2}O,${c1} ':clod:'${c1} ${c1} -" diff --git a/ascii/distro/kali b/ascii/distro/kali index 6500a478..d1e01da6 100644 --- a/ascii/distro/kali +++ b/ascii/distro/kali @@ -1,4 +1,3 @@ -"\ ${c1}.............. ..,;:ccc,. ......''';lxO. @@ -20,4 +19,3 @@ ${c1}.............. c .' . -" diff --git a/ascii/distro/kaos b/ascii/distro/kaos index d5d06d91..830835e4 100644 --- a/ascii/distro/kaos +++ b/ascii/distro/kaos @@ -1,4 +1,3 @@ -"\ ${c1} .. ..... ..OSSAAAAAAA.. .KKKKSS. .SSAAAAAAAAAAA. @@ -15,4 +14,3 @@ KKKKKKS. .SSAA.. .K ..SSSASSSS.. ..SSA. .SSS.AAKAKSSKA. .SSS....S.. -" diff --git a/ascii/distro/kde b/ascii/distro/kde index b6aa9f63..16809700 100644 --- a/ascii/distro/kde +++ b/ascii/distro/kde @@ -1,4 +1,4 @@ -${c1}' `..---+/---..` +${c1} `..---+/---..` `---.`` `` `.---.` .--.` `` `-:-. `:/: `.----//----.` :/- @@ -17,4 +17,3 @@ ${c1}' `..---+/---..` .-:.` `` `-:-. `---.`` `` `.---.` `..---+/---..` -' diff --git a/ascii/distro/kogaion b/ascii/distro/kogaion index 2c3f6c84..47ed962e 100644 --- a/ascii/distro/kogaion +++ b/ascii/distro/kogaion @@ -1,4 +1,3 @@ -"\ ${c1} ;; ,; ;;; ,;; ,;;;; ;;;; @@ -19,4 +18,3 @@ ${c1} ;; ,; ';;;;;;;; ;;;;;; ';;;;; ;;;; ';;; ;; -" From 44f8168088dec0db5d533f0c40dba029016a99be Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Nov 2016 20:30:05 +1100 Subject: [PATCH 3/4] Ascii: Convert more ascii --- ascii/distro/korora | 30 ++++++++++++++---------------- ascii/distro/kubuntu | 34 ++++++++++++++++------------------ ascii/distro/linux | 2 -- ascii/distro/lmde | 28 +++++++++++++--------------- ascii/distro/lubuntu | 30 ++++++++++++++---------------- ascii/distro/mac | 20 +++++++++----------- ascii/distro/mageia | 2 -- ascii/distro/manjaro | 2 -- ascii/distro/mint | 26 ++++++++++++-------------- ascii/distro/netbsd | 18 +++++++++--------- ascii/distro/netrunner | 2 -- ascii/distro/nixos | 2 -- ascii/distro/openbsd | 28 +++++++++++++--------------- ascii/distro/openbsd_small | 2 -- ascii/distro/openindiana | 20 +++++++++----------- ascii/distro/openmandriva | 28 +++++++++++++--------------- ascii/distro/openwrt | 2 -- ascii/distro/oracle | 16 +++++++--------- ascii/distro/pacbsd | 36 +++++++++++++++++------------------- ascii/distro/parabola | 2 -- ascii/distro/pclinuxos | 20 +++++++++----------- ascii/distro/peppermint | 2 -- neofetch | 3 +-- 23 files changed, 156 insertions(+), 199 deletions(-) diff --git a/ascii/distro/korora b/ascii/distro/korora index a46f0075..709289af 100644 --- a/ascii/distro/korora +++ b/ascii/distro/korora @@ -1,18 +1,16 @@ -"\ ${c2} ____________ _add55555555554${c1}: - _w?'${c1}\`\`\`\`\`\`\`\`\`\`'${c2})k${c1}: - _Z'${c1}\`${c2} ]k${c1}: - m(${c1}\`${c2} )k${c1}: - _.ss${c1}\`${c2}m[${c1}\`${c2}, ]e${c1}: - .uY\"^\`${c1}\`${c2}Xc${c1}\`${c2}?Ss. d(${c1}\` - jF'${c1}\`${c2} \`@. ${c1}\`${c2}Sc .jr${c1}\` - jr${c1}\`${c2} \`?n_ ${c1}\`${c2}$; _a2\"${c1}\` -.m${c1}:${c2} \`~M${c1}\`${c2}1k${c1}\`${c2}5?!\`${c1}\` -:#${c1}:${c2} ${c1}\`${c2})e${c1}\`\`\` -:m${c1}:${c2} ,#'${c1}\` -:#${c1}:${c2} .s2'${c1}\` -:m,________.aa7^${c1}\` -:#baaaaaaas!J'${c1}\` - \`\`\`\`\`\`\`\`\`\`\` -" + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` diff --git a/ascii/distro/kubuntu b/ascii/distro/kubuntu index bd2fb3f0..3f7126c1 100644 --- a/ascii/distro/kubuntu +++ b/ascii/distro/kubuntu @@ -1,22 +1,20 @@ -"\ -${c1} \`.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:\` - -oyyyyyyyo-\`\`/yyyyyyysyyyyo- - -syyyyyyyyyy\` +yyyy/\` \`/yyyys- - +yyys/./syyyy: ..-\` /yyyyyy+ - \`oyyyy: \`:syys+oooo+:. .yyyyyyyyo\` - +yyyyyy/ \`/yyyyyyyyyyys/\` /sssssyyy+ +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo-``/yyyyyyysyyyyo- + -syyyyyyyyyy` +yyyy/` `/yyyys- + +yyys/./syyyy: ..-` /yyyyyy+ + `oyyyy: `:syys+oooo+:. .yyyyyyyyo` + +yyyyyy/ `/yyyyyyyyyyys/` /sssssyyy+ -yyyyyyyy- -syyyyyyyyyyyyyys- syyy- -oyyyyso+: .yyyyyyyyyyyyyyyyyy. \`.+yyyo +oyyyyso+: .yyyyyyyyyyyyyyyyyy. `.+yyyo yyys /yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys.\` /yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyyso: .yyyyyyyyyyyyyyyyyy.\`.-:/syyyo +yyys.` /yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyyso: .yyyyyyyyyyyyyyyyyy.`.-:/syyyo -yyyyyyyy. -syyyyyyyyyyyyyys- syyy- - +yyyyyy: \`syyyyyyyyyyys/\` /o+++oyyy+ - \`oyyyy. -syyy++oooo+/. oyyyyyyyyo - +yyys/-oyyyys\` \`..\` -yyyyyyy+ - -syyyyyyyyy: .syyy/\` \`syyyys- - -oyyyyyyy:.\`-yyyyyys+syyyyo- + +yyyyyy: `syyyyyyyyyyys/` /o+++oyyy+ + `oyyyy. -syyy++oooo+/. oyyyyyyyyo + +yyys/-oyyyys` `..` -yyyyyyy+ + -syyyyyyyyy: .syyy/` `syyyys- + -oyyyyyyy:.`-yyyyyys+syyyyo- ./oyyyyyyyyyyyyyyyyyyo/. - \`.:/oosyyyysso/:.\` -" + `.:/oosyyyysso/:.` diff --git a/ascii/distro/linux b/ascii/distro/linux index dff5a167..f31dd29f 100644 --- a/ascii/distro/linux +++ b/ascii/distro/linux @@ -1,4 +1,3 @@ -"\ ${c2} ##### ${c2} ####### ${c2} ##${c1}O${c2}#${c1}O${c2}## @@ -11,4 +10,3 @@ ${c3} ##${c2}#${c1}###########${c2}##${c3}# ${c3}######${c2}#${c1}#######${c2}#${c3}###### ${c3}#######${c2}#${c1}#####${c2}#${c3}####### ${c3} #####${c2}#######${c3}##### -" diff --git a/ascii/distro/lmde b/ascii/distro/lmde index a6c855c5..5161881e 100644 --- a/ascii/distro/lmde +++ b/ascii/distro/lmde @@ -1,19 +1,17 @@ -"\ - ${c2}\`.-::---.. + ${c2}`.-::---.. ${c1} .:++++ooooosssoo:. - .+o++::. \`.:oos+. -${c1} :oo:.\` -+oo${c2}: -${c1} ${c2}\`${c1}+o/\` .${c2}::::::${c1}-. .++-${c2}\` -${c1}${c2}\`${c1}/s/ .yyyyyyyyyyo: +o-${c2}\` -${c1}${c2}\`${c1}so .ss ohyo\` :s-${c2}: -${c1}${c2}\`${c1}s/ .ss h m myy/ /s\`${c2}\` -${c1}\`s: \`oo s m Myy+-o:\` -\`oo :+sdoohyoydyso/. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. :o. .:////////++: -${c1} \`/++ ${c2}-:::::- -${c1} ${c2}\`${c1}++- -${c1} ${c2}\`${c1}/+- +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- ${c1} ${c2}.${c1}+/. ${c1} ${c2}.${c1}:+-. - \`--.\`\` -" + `--.`` diff --git a/ascii/distro/lubuntu b/ascii/distro/lubuntu index 9301621e..9731cb3e 100644 --- a/ascii/distro/lubuntu +++ b/ascii/distro/lubuntu @@ -1,22 +1,20 @@ -"\ -${c1} \`-/+oyyhhhhyyo+/-\` +${c1} `-/+oyyhhhhyyo+/-` ./shhhhhhhhhhhhhhhhhhs/. - \`:shhhhhhhhhhhhhhhhhhhhhhhhs:\` + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - \`ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho\` - \`shhhhhhhhhhy+:\` /yhhhhhhhhhhhhhs\` + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` shhhhhhhhy+. .ohhhhhhhhhhhhhs :hhhhhhy/. /hhhhhhhhhhhhh: shhhy/. :hhhhhhhhhhhhs -hy+. \` \`+yhs/\` +hhhhhhhhhhhh --.:/oshy- \` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-\`/s. .shhhhhhhhho\` .hhhhhhhhhhs -:hhhho\`:ys\` /yhhhhhhhhhhhs\` +hhhhhhhhh: - shh/.sh+ \`ohhhhhhhhhhhhhhs\` .hhhhhhhhs - \`o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs\` - +hy-\`ohhhhhhhhhhhhhhhhhhh+ -hhhhho\` +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy\`+s:\` - .+shhhhhhhhhhhhhhhhhhs:\` - \`-/+oyyhhhhyys+/-\` -" + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` diff --git a/ascii/distro/mac b/ascii/distro/mac index e29fc371..6dc4de69 100644 --- a/ascii/distro/mac +++ b/ascii/distro/mac @@ -1,18 +1,16 @@ -"\ ${c1} -/+:. :++++. /+++/. - .:-::- .+/:-\`\`.::- - .:/++++++/::::/++++++/:\` -${c2} .:///////////////////////:\` - ////////////////////////\` -${c3}-+++++++++++++++++++++++\` + .:-::- .+/:-``.::- + .:/++++++/::::/++++++/:` +${c2} .:///////////////////////:` + ////////////////////////` +${c3}-+++++++++++++++++++++++` /++++++++++++++++++++++/ ${c4}/sssssssssssssssssssssss. :ssssssssssssssssssssssss- -${c5} osssssssssssssssssssssssso/\` - \`syyyyyyyyyyyyyyyyyyyyyyyy+\` -${c6} \`ossssssssssssssssssssss/ +${c5} osssssssssssssssssssssssso/` + `syyyyyyyyyyyyyyyyyyyyyyyy+` +${c6} `ossssssssssssssssssssss/ :ooooooooooooooooooo+. - \`:+oo+/:-..-:/+o+/- -" + `:+oo+/:-..-:/+o+/- diff --git a/ascii/distro/mageia b/ascii/distro/mageia index 34d351f5..af01caba 100644 --- a/ascii/distro/mageia +++ b/ascii/distro/mageia @@ -1,4 +1,3 @@ -"\ ${c1} .°°. °° .°°. .°°°. °° @@ -18,4 +17,3 @@ lOO. .OO: .lO0Kc;,,,,,,;c0KOc. ;d00KKKKKK00d; .,KKKK,. -" diff --git a/ascii/distro/manjaro b/ascii/distro/manjaro index 33efdbc7..d0d37c42 100644 --- a/ascii/distro/manjaro +++ b/ascii/distro/manjaro @@ -1,4 +1,3 @@ -"\ ${c1}██████████████████ ████████ ██████████████████ ████████ ██████████████████ ████████ @@ -16,4 +15,3 @@ ${c1}██████████████████ ██████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ -" diff --git a/ascii/distro/mint b/ascii/distro/mint index a171e70f..c7e59d99 100644 --- a/ascii/distro/mint +++ b/ascii/distro/mint @@ -1,18 +1,16 @@ -"\ ${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+\` +MMm----::-://////////////oymNMd+` MMd ${c2}/++ ${c1}-sNMd: -MMNso/\` ${c2}dMM \`.::-. .-::.\` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}\`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN\` ${c1}dMM - NMm ${c2}dMM -MMm \`MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm \`MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd \`mmm yMM. ${c1}dMM - NMm ${c2}dMM\` ..\` ... ydm. ${c1}dMM +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/\` ${c1}dMM - -dMNs-${c2}\`\`-::::-------.\`\` ${c1}dMM - \`/dMNmy+/:-------------:/yMMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM ./ydNMMMMMMMMMMMMMMMMMMMMM - \.MMMMMMMMMMMMMMMMMMM -" + .MMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/netbsd b/ascii/distro/netbsd index 73f4a201..6048ee3a 100644 --- a/ascii/distro/netbsd +++ b/ascii/distro/netbsd @@ -1,11 +1,10 @@ -"\ -${c1} \`-/oshdmNMNdhyo+:-\` -${c2}y${c1}/s+:-\`\` \`.-:+oydNMMMMNhs/-\`\` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-\` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:\` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:\` - ${c2}-N/${c1}hMMMMMMMMMmho:\` - ${c2}-N/${c1}-:/++/:.\` +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` ${c2} :M+ :Mo :Ms @@ -14,4 +13,5 @@ ${c2} :M+ :Ms :Ms :Ms -" + :Ms + :Ms diff --git a/ascii/distro/netrunner b/ascii/distro/netrunner index 29ce7429..d6da7b99 100644 --- a/ascii/distro/netrunner +++ b/ascii/distro/netrunner @@ -1,4 +1,3 @@ -"\ ${c1}nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn nnnnnnnnnnnnnn nnnnnnnnnnnnnn nnnnnnnnnn nnnnnnnnnn nnnnnnnnnn @@ -21,4 +20,3 @@ nnnnnnn nnnnnnnnnnnnnnnnnnnn nnnnnnn nnnnnnnnnn nnnnnnnnnn nnnnnnnnnn nnnnnnnnnnnnnn nnnnnnnnnnnnnn nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn -" diff --git a/ascii/distro/nixos b/ascii/distro/nixos index 217c4d1c..d1a35bd2 100644 --- a/ascii/distro/nixos +++ b/ascii/distro/nixos @@ -1,4 +1,3 @@ -"\ ${c1} ::::. ${c2}'::::: ::::' ${c1} '::::: ${c2}':::::. ::::' ${c1} ::::: ${c2}'::::.::::: @@ -18,4 +17,3 @@ ${c1} .:::::::: ${c2}':::::::::: ${c1} .::::''::::. ${c2}'::::. ${c1} .::::' ::::. ${c2}'::::. ${c1} .:::: :::: ${c2}'::::. -" diff --git a/ascii/distro/openbsd b/ascii/distro/openbsd index 14821159..e5749985 100644 --- a/ascii/distro/openbsd +++ b/ascii/distro/openbsd @@ -1,25 +1,23 @@ -"\ ${c3} _ (_) ${c1} | . ${c1} . |L /| . ${c3} _ ${c1} _ . |\ _| \--+._/| . ${c3}(_) ${c1} / ||\| Y J ) / |/| ./ - J |)\'( | \` F\`.\'/ ${c3} _ + J |)'( | ` F`.'/ ${c3} _ ${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-\'${c3}. ${c1}\`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\\\${c1}|.-\' ${c3} _ +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\\\${c1}|.-' ${c3} _ ${c1} _J \\ .- \\\\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} \'-F -<_. \\ .-\' \`-\' L__ -__J _ _. >-\' ${c1})${c4}._. ${c1}|-\' -${c1} \`-|.\' /_. ${c4}\_| ${c1} F +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F /.- . _.< - /\' /.\' .\' \`\\ - /L /\' |/ _.-\'-\\ - /\'J ___.---\'\| - |\ .--\' V | \`. \` - |/\`. \`-. \`._) + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) / .-.\\ - \\ ( \`\\ - \`.\ -" + \\ ( `\\ + `.\ diff --git a/ascii/distro/openbsd_small b/ascii/distro/openbsd_small index ca13d56b..bb6e646a 100644 --- a/ascii/distro/openbsd_small +++ b/ascii/distro/openbsd_small @@ -1,4 +1,3 @@ -"\ ${c1} _____ \\- -/ \\_/ \\ @@ -6,4 +5,3 @@ ${c1} _____ |_ < ) 3 ) / \\ / /-_____-\\ -" diff --git a/ascii/distro/openindiana b/ascii/distro/openindiana index 0e4c41f6..c76d8f7b 100644 --- a/ascii/distro/openindiana +++ b/ascii/distro/openindiana @@ -1,18 +1,16 @@ -"\ ${c2} .sy/ .yh+ ${c1}-+syyyo+- ${c2} /+. ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}\`hm+ \`sms${c2} ym-\`\`\`\`\`\`\`.-. + ${c1}`hm+ `sms${c2} ym-```````.-. ${c1}sm+ sm/ ${c2} ym- +s ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- \`os\` - ${c1}smo\` .ym+ ${c2} ym- .os- - \`\` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..\` ${c1}\`:+oo+/-\` ${c2} -//oyo- - -:\` .:oys/. -+- \`./oyys/. -h+\` \`.-:+oyyyo/-\` -\`/ossssysso+/-.\` -" + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` diff --git a/ascii/distro/openmandriva b/ascii/distro/openmandriva index 33772a0b..ef3e8439 100644 --- a/ascii/distro/openmandriva +++ b/ascii/distro/openmandriva @@ -1,17 +1,15 @@ -"\ -${c2} \`\` - \`-. -${c1} \` ${c2}.--- -${c1} -/ ${c2}-::--\` -${c1} \`++ ${c2}\`----...\`\`\`-:::::. -${c1} \`os. ${c2}.::::::::::::::-\`\`\` \` \` -${c1} +s+ ${c2}.::::::::::::::::---...--\` -${c1}-ss: ${c2}\`-::::::::::::::::-.\`\`.\`\` -${c1}/ss- ${c2}.::::::::::::-.\`\` \` +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` ${c1}+ss: ${c2}.::::::::::::- ${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.\` .::::: -${c1} /sss+. ${c2}..\`${c1} \`--\` ${c2}.::: -${c1} -ossso+/:://+/-\` ${c2}.:\` -${c1} -/+ooo+/-. ${c2}\` -" +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` diff --git a/ascii/distro/openwrt b/ascii/distro/openwrt index b9ce0172..903068b0 100644 --- a/ascii/distro/openwrt +++ b/ascii/distro/openwrt @@ -1,4 +1,3 @@ -"\ ${c1} _______ | |.-----.-----.-----. | - || _ | -__| | @@ -8,4 +7,3 @@ ${c1} _______ | | | |.----.| |_ | | | || _|| _| |________||__| |____| -" diff --git a/ascii/distro/oracle b/ascii/distro/oracle index 5bc1e46f..cdd61c55 100644 --- a/ascii/distro/oracle +++ b/ascii/distro/oracle @@ -1,14 +1,12 @@ -"\ ${c1} - \`-/+++++++++++++++++/-.\` - \`/syyyyyyyyyyyyyyyyyyyyyyys/. + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. :yyyyo/-...............-/oyyyy/ /yyys- .oyyy+ -.yyyy\` \`syyy- +.yyyy` `syyy- :yyyo /yyy/ -.yyyy\` \`syyy- +.yyyy` `syyy- /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/\` - \`/syyyyyyyyyyyyyyyyyyyyyyys+. - \`.:/+ooooooooooooooo+/:.\` -" + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` diff --git a/ascii/distro/pacbsd b/ascii/distro/pacbsd index fb07b425..000e93a0 100644 --- a/ascii/distro/pacbsd +++ b/ascii/distro/pacbsd @@ -1,26 +1,24 @@ -"\ ${c1} :+sMs. - \`:ddNMd- -o--\` - -sMMMMh: \`+N+\`\` - yMMMMMs\` .....-/-... \`mNh/ - yMMMMMmh+-\`:sdmmmmmmMmmmmddy+-\`\`./ddNMMm + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh\` -.hMMMMdhdMMMMMMMMMMMMMMmo \`sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN\`smMNo\` -/dMMMMMMMMMMMMMMMMMMMMMNd/\` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh\` oMMMMMMNo/dMNN\` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++\` + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/\` -// - /dMMMMMMMMMMMMMs- \`\`\`\`\`\`\`\`..\`\` - .oMMMMMMMMMMMMNs\` ./y:\` - +dNMMNMMMMMMMmy\` \`\`./ys. - \`/hMMMMMMMMMMMNo-\`\` \`.+yy+-\` - \`-/hmNMNMMMMMMmmddddhhy/-\` - \`-+oooyMMMdsoo+/:. -" + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. diff --git a/ascii/distro/parabola b/ascii/distro/parabola index f9bc3ee3..fb257c2b 100644 --- a/ascii/distro/parabola +++ b/ascii/distro/parabola @@ -1,4 +1,3 @@ -"\ ${c1} eeeeeeeee eeeeeeeeeeeeeee eeeeee${c2}//////////${c1}eeeee @@ -16,4 +15,3 @@ e ${c2}/${c1}eeeeeee eee ee e -" diff --git a/ascii/distro/pclinuxos b/ascii/distro/pclinuxos index 8aed6dbc..963d3929 100644 --- a/ascii/distro/pclinuxos +++ b/ascii/distro/pclinuxos @@ -1,21 +1,19 @@ -"\ ${c1}mhhhyyyyhhhdN dyssyhhhhhhhhhhhssyhN Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. \`/shhysm + Nsshhy+. `/shhysm dohhy/ -shhsy - dohhs\` /hhys + dohhs` /hhys N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh\` ${c2}ymmo++hmm+\`smmy/::+y\` ${c1}shh+ +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ +hho ${c2}ymm- /mmy+mms ${c1}:hhod /hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-\` /mmy\` \` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd\` ${c1}\`yhh+ - ohhy\` ${c2}://\` -/+++/- ${c1}ohhom - N+hhy- \`shhoh - sshho. \`+hhyom - dsyhhs/. \`:ohhhoy ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy dysyhhhso///://+syhhhssh dhyssyhhhhhhyssyyhN mddhdhdmN -" diff --git a/ascii/distro/peppermint b/ascii/distro/peppermint index cefc918f..be0a953b 100644 --- a/ascii/distro/peppermint +++ b/ascii/distro/peppermint @@ -1,4 +1,3 @@ -"\ ${c1} 8ZZZZZZ${c2}MMMMM ${c1} .ZZZZZZZZZ${c2}MMMMMMM. ${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ @@ -18,4 +17,3 @@ ${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z ${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM ${c1} NZZZZZZZZZZZ${c2}MMMMM ${c1} ZZZZZZZZZ${c2}MM) -" diff --git a/neofetch b/neofetch index b7ac9194..e0ecb72c 100755 --- a/neofetch +++ b/neofetch @@ -2009,6 +2009,7 @@ getascii() { # Calculate size of ascii file in line length / line count. line="${line//\$\{??\}}" line="${line//'\\'/'\'}" + line="${line//█/.}" [[ "${#line}" -gt "${ascii_length:-0}" ]] && ascii_length="${#line}" lines="$((lines+=1))" done < "$ascii" @@ -2935,8 +2936,6 @@ dynamicprompt() { if [[ "$image" != "ascii" ]]; then gettermpadding lines="$(((height + (${border:-0} * 2) + ${yoffset:-0}) / font_height))" - else - lines="$((lines-=2))" fi # If the info is higher than the ascii/image place the prompt From 9311e7310d7677618f661857400332e0874d2b9e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Nov 2016 20:50:39 +1100 Subject: [PATCH 4/4] Ascii: Finish converting ascii art --- ascii/distro/porteus | 38 +++++++++++++++++------------------ ascii/distro/puppy | 20 +++++++++---------- ascii/distro/qubes | 34 +++++++++++++++---------------- ascii/distro/raspbian | 2 -- ascii/distro/redhat | 20 +++++++++---------- ascii/distro/redstar | 2 -- ascii/distro/rosa | 2 -- ascii/distro/sabayon | 2 -- ascii/distro/sailfishos | 2 -- ascii/distro/scientific | 4 +--- ascii/distro/slackware | 2 -- ascii/distro/solus | 24 ++++++++++------------ ascii/distro/sparky | 42 +++++++++++++++++++-------------------- ascii/distro/steamos | 6 ++---- ascii/distro/suse | 2 -- ascii/distro/tails | 24 ++++++++++------------ ascii/distro/travis | 4 ---- ascii/distro/trisquel | 2 -- ascii/distro/ubuntu | 28 ++++++++++++-------------- ascii/distro/ubuntu-gnome | 30 +++++++++++++--------------- ascii/distro/void | 25 ++++++++++------------- ascii/distro/windows | 18 ++++++++--------- ascii/distro/windows10 | 10 ++++------ ascii/distro/xubuntu | 22 ++++++++++---------- ascii/distro/zorin | 20 +++++++++---------- neofetch | 12 +++++------ 26 files changed, 172 insertions(+), 225 deletions(-) diff --git a/ascii/distro/porteus b/ascii/distro/porteus index cd521b70..82cc7aa9 100644 --- a/ascii/distro/porteus +++ b/ascii/distro/porteus @@ -1,25 +1,23 @@ -"\ -${c1} \`.-:::-.\` +${c1} `.-:::-.` -+ydmNNNNNNNmdy+- .+dNmdhs+//////+shdmdo. - .smmy+-\` ./sdy: - \`omdo. \`.-/+osssso+/-\` \`+dy. - \`yms. \`:shmNmdhsoo++osyyo-\`\`oh. - hm/ .odNmds/.\` \`\`.....:::-+s -/m: \`+dNmy:\` \`./oyhhhhyyooo++so -ys \`yNmy- .+hmmho:-.\` \`\`\` -s: yNm+\` .smNd+. -\`\` /Nm: +dNd+\` - yN+ \`smNy. - dm oNNy\` + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` hy -mNm. +y oNNo - \`y\` sNN: - \`: +NN: - \` .mNo - /mm\` - /my\` - .sy\` + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` .+: - \` -" + ` diff --git a/ascii/distro/puppy b/ascii/distro/puppy index 7acbaa12..7cdc1c2d 100644 --- a/ascii/distro/puppy +++ b/ascii/distro/puppy @@ -1,20 +1,18 @@ -"\ -${c1} \`-/osyyyysosyhhhhhyys+- +${c1} `-/osyyyysosyhhhhhyys+- -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy .NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd\`dNNNNNmmmmNNmdd/os/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ .Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:\` ./hmmmmmmmNNNN: hNMh + NNNNy:` ./hmmmmmmmNNNN: hNMh NMN- -++- +NNNNNNNNNNm+..-sMMMM- .MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-\` yMMMMMMMM+ - mMM+ .. \`sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:\` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd\` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy\` +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/\` + /dMMMMMMMMMMMMMMMMMMNdy/` .+hNMMMMMMMMMNmdhs/. .:/+ooo+/:-. -" diff --git a/ascii/distro/qubes b/ascii/distro/qubes index 0c1eb649..3867fa6f 100644 --- a/ascii/distro/qubes +++ b/ascii/distro/qubes @@ -1,23 +1,21 @@ -"\ -${c1} \`..--..\` - \`.----------.\` - \`..----------------..\` - \`.------------------------.\`\` - \`..-------------....-------------..\` -.::----------..\`\` \`\`..----------:+: -:////:----..\` \`..---:/ossso -:///////:\` \`/osssssso +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso :///////: /ssssssso :///////: /ssssssso :///////: /ssssssso :///////: /ssssssso :///////: /ssssssso -:////////-\` .:sssssssso -:///////////-.\` \`-/osssssssssso -\`//////////////:-\`\`\`.:+ssssssssssssso- - .-://////////////sssssssssssssso/-\` - \`.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/\` - \`.:////ssss+/+ssssssssssss. - \`--//- \`-/osssso/. -" +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. diff --git a/ascii/distro/raspbian b/ascii/distro/raspbian index 941a494f..3da139fc 100644 --- a/ascii/distro/raspbian +++ b/ascii/distro/raspbian @@ -1,4 +1,3 @@ -"\ ${c1} .',;:cc;,'. .,;::c:,,. ,ooolcloooo: 'oooooccloo: .looooc;;:ol :oc;;:ooooo' @@ -17,4 +16,3 @@ ${c1} .',;:cc;,'. .,;::c:,,. ..''. . .''.. .''''''' ...... -" diff --git a/ascii/distro/redhat b/ascii/distro/redhat index d362d90c..868521f4 100644 --- a/ascii/distro/redhat +++ b/ascii/distro/redhat @@ -1,18 +1,16 @@ -"\ -${c1} \`.-..........\` - \`////////::.\`-/. +${c1} `.-..........` + `////////::.`-/. -: ....-////////. - //:-::///////////\` - \`--::: \`-://////////////: - //////- \`\`.-:///////// .\` - \`://////:-.\` :///////::///:\` + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` .-/////////:---/////////////: .-://////////////////////. -${c2} yMN+\`.-${c1}::///////////////-\` -${c2} .-\`:NMMNMs\` \`..-------..\` +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` MN+/mMMMMMhoooyysshsss MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh\` hyhMMM + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM -" diff --git a/ascii/distro/redstar b/ascii/distro/redstar index 504bbac7..6c15233f 100644 --- a/ascii/distro/redstar +++ b/ascii/distro/redstar @@ -1,4 +1,3 @@ -"\ ${c1} .. .oK0l :0KKKKd. @@ -17,4 +16,3 @@ ${c1} .. :cccc::::;...';;;;;,,,,,,. ,::::::;;;,'. ..',,,,'''. ........ ...... -" diff --git a/ascii/distro/rosa b/ascii/distro/rosa index 6e8115bc..fcbad876 100644 --- a/ascii/distro/rosa +++ b/ascii/distro/rosa @@ -1,4 +1,3 @@ -"\ ${c1} ROSAROSAROSAROSAR ROSA AROS ROS SAROSAROSAROSAR AROS @@ -19,4 +18,3 @@ RO ROSA ROS ROSAROSAR ROSARO RO AROS AROSAROSAROSARO AROS ROSA SARO ROSAROSAROSAROSAR -" diff --git a/ascii/distro/sabayon b/ascii/distro/sabayon index fefc8cf0..bfd51eed 100644 --- a/ascii/distro/sabayon +++ b/ascii/distro/sabayon @@ -1,4 +1,3 @@ -"\ ${c1} ........... .. .. .. .. @@ -17,4 +16,3 @@ ${c1} ........... .. .. .. .. ............... -" diff --git a/ascii/distro/sailfishos b/ascii/distro/sailfishos index 93c2bb49..a7dd91b4 100644 --- a/ascii/distro/sailfishos +++ b/ascii/distro/sailfishos @@ -1,4 +1,3 @@ -"\ ${c1} .+eWWW .+ee+++eee e. .ee++eeeeeeee +e. @@ -17,4 +16,3 @@ ${c1} .+eWWW ee ee e -" diff --git a/ascii/distro/scientific b/ascii/distro/scientific index d449bef9..d5a2e700 100644 --- a/ascii/distro/scientific +++ b/ascii/distro/scientific @@ -1,4 +1,3 @@ -"\ ${c1} =/;;/- +: // /; /; @@ -10,7 +9,7 @@ M- ,=;;;#:, ,:#;;:=, ,@ ,+/. ,;@+, ,#H;, ,/+, ;+;;/= @. ${c2}.H${c3}#${c2}#X ${c1}-X :///+; ;+=;;;.@, ${c3}.X${c2}M${c3}@$. ${c1}=X.//;=#/. - ,;: :@#= =\$H: .+#- + ,;: :@#= =$H: .+#- ,#= #;-///==///-// =#, ;+ :#-;;;:;;;;-X- +: @- .-;;;;M- =M/;;;-. -X @@ -19,4 +18,3 @@ M- ,=;;;#:, ,:#;;:=, ,@ ;/ #= // +; '////' -" diff --git a/ascii/distro/slackware b/ascii/distro/slackware index 6a2160e0..9ffde3dc 100644 --- a/ascii/distro/slackware +++ b/ascii/distro/slackware @@ -1,4 +1,3 @@ -"\ ${c1} ::::::: ::::::::::::::::::: ::::::::::::::::::::::::: @@ -20,4 +19,3 @@ ${c1} ::::::: :::::::::::::::::::::::::::: :::::::::::::::::::::: :::::::::::: -" diff --git a/ascii/distro/solus b/ascii/distro/solus index 2dc4f634..75637543 100644 --- a/ascii/distro/solus +++ b/ascii/distro/solus @@ -1,22 +1,20 @@ -"\ -${c2} -\`\`\`\`\`\`\`\`\`\`\` - \`-+/------------.\` +${c2} -``````````` + `-+/------------.` .---:mNo---------------. .-----yMMMy:---------------. - \`------oMMMMMm/----------------\` + `------oMMMMMm/----------------` .------/MMMMMMMN+----------------. .------/NMMMMMMMMm-+/--------------. -\`------/NMMMMMMMMMN-:mh/-------------\` +`------/NMMMMMMMMMN-:mh/-------------` .-----/NMMMMMMMMMMM:-+MMd//oso/:-----. -----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- ----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-\` -\`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -\`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ .------------:://+-/++++++${c1}oshddys: -hhhhyyyyyyyyyyyhhhhddddhysssso- - \`:ossssssyysssssssssssssssso:\` - \`:+ssssssssssssssssssss+- - \`-/+ssssssssssso+/-\` - \`.-----..\` -" + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` diff --git a/ascii/distro/sparky b/ascii/distro/sparky index c9072390..82acb5a0 100644 --- a/ascii/distro/sparky +++ b/ascii/distro/sparky @@ -1,23 +1,21 @@ -"\ ${c1} - . \`-:-\` - .o\` .-///-\` - \`oo\` .:/++:. - os+\` -/+++:\` \`\`.........\`\`\` - /ys+\`./+++/-.-::::::----......\`\` - \`syyo\`++o+--::::-::/+++/-\`\` - -yyy+.+o+\`:/:-:sdmmmmmmmmdy+-\` -::-\` :yyy/-oo.-+/\`ymho++++++oyhdmdy/\` -\`/yy+-\`.syyo\`+o..o--h..osyhhddhs+//osyy/\` - -ydhs+-oyy/.+o.-: \` \` :/::+ydhy+\`\`\`-os- - .sdddy::syo--/:. \`.:dy+-ohhho ./: - :yddds/:+oo+//:-\`- /+ +hy+.shhy: \`\` - \`:ydmmdysooooooo-.ss\`/yss--oyyo - \`./ossyyyyo+:-/oo:.osso- .oys - \`\`..-------::////.-oooo/ :so - \`...----::::::::--.\`/oooo: .o: - \`\`\`\`\`\`\` ++o+:\` \`:\` - ./+/-\` \` - \`-:-. - \`\` -" + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` diff --git a/ascii/distro/steamos b/ascii/distro/steamos index b06cbad8..c17b16b6 100644 --- a/ascii/distro/steamos +++ b/ascii/distro/steamos @@ -1,4 +1,3 @@ -"\ ${c1} .,,,,. .,'onNMMMMMNNnn',. .'oNMANKMMMMMMMMMMMNNn'. @@ -8,13 +7,12 @@ ${c1} .,,,,. ,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, '${c2}+#############, +. ,+' ${c1}+NMMM ${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} \`'*###*' ,.,;###${c1}+WNM, +${c2} `'*###*' ,.,;###${c1}+WNM, ${c2} .,;;, .;##########${c1}+W ${c2},',. '; ,+##############' '###+. :,. .,; ,###############' - '####.. \`'' .,###############' + '####.. `'' .,###############' '#####+++################' '*##################*' ''*##########*'' '''''' -" diff --git a/ascii/distro/suse b/ascii/distro/suse index 020cd8e8..6cc0433c 100644 --- a/ascii/distro/suse +++ b/ascii/distro/suse @@ -1,4 +1,3 @@ -"\ ${c2} .;ldkO0000Okdl;. .;d00xl:^''''''^:ok00d;. .d00l' 'o00d. @@ -17,4 +16,3 @@ dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd 'l0Kk:. .;xK0l' 'lkK0xl:;,,,,;:ldO0kl' '^:ldxkkkkxdl:^' -" diff --git a/ascii/distro/tails b/ascii/distro/tails index c03f8b26..a0512bc6 100644 --- a/ascii/distro/tails +++ b/ascii/distro/tails @@ -1,21 +1,19 @@ -"\ -${c1} \`\` +${c1} `` ./yhNh -syy/Nshh \`:o/ -N:dsNshh █ \`ohNMMd -N-/+Nshh \`yMMMMd +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd N-yhMshh yMMMMd N-s:hshh █ yMMMMd so//. N-oyNsyh yMMMMd d Mms. N:hohhhd:. yMMMMd syMMM+ Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/\`yMMMM \`+d+ - :sy/. ./yNMMMMm \`\` - .+ys- \`:+hNMMMMMMy/\` - \`hNmmMMMMMMMMMMMMdo. ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. dMMMMMMMMMMMMMMMMMNh: +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.\` - \`:yNMMMds/.\` - .//\` -" + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` diff --git a/ascii/distro/travis b/ascii/distro/travis index 96f43d99..c4ab4efa 100644 --- a/ascii/distro/travis +++ b/ascii/distro/travis @@ -1,10 +1,6 @@ -"\ ${c1} _______ _ ${c2}|__ __| | | ${c3} | | ___ ___| |_ ${c4} | |/ _ \/ __| __| ${c5} | | __/\__ \ |_ ${c6} |_|\___||___/\__| - - -" diff --git a/ascii/distro/trisquel b/ascii/distro/trisquel index 85b6c994..07634b83 100644 --- a/ascii/distro/trisquel +++ b/ascii/distro/trisquel @@ -1,4 +1,3 @@ -"\ ${c1} ▄▄▄▄▄▄ ▄█████████▄ ▄▄▄▄▄▄ ████▀ ▀████ @@ -17,4 +16,3 @@ ${c1} ▀█████████ ███████${c2}███▀ █████▄ ▀▀ ▄██ ██████▄▄▄████ ▀▀█████▀▀ -" diff --git a/ascii/distro/ubuntu b/ascii/distro/ubuntu index 83ce3861..c96f6282 100644 --- a/ascii/distro/ubuntu +++ b/ascii/distro/ubuntu @@ -1,20 +1,18 @@ -"\ ${c1} ./+o+- ${c2} yyyyy- ${c1}-yyyyyy+ ${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/\` +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` ${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}\`..\`\`\`.-/oo+++++/ -${c3} .:+o:+o/.${c2} \`+sssoo+/ -${c2} .++/+:${c3}+oo+o:\`${c2} /sssooo. -${c2}/+++//+:${c3}\`oo+o${c2} /::--:. -${c2}\+/+o+++${c3}\`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:\`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} \`oddhhhh+ -${c3} \+.++o+o\`${c1}\`-\`\`\`\`.:ohdhhhhh+ -${c3} \`:o+++ ${c1}\`ohhhhhhhhyo++os: -${c3} .o:${c1}\`.syhhhhhhh/${c3}.oo++o\` +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` ${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} \`\`\`\`\` ${c3}+oo+++o\: -${c3} \`oo++. -" +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. diff --git a/ascii/distro/ubuntu-gnome b/ascii/distro/ubuntu-gnome index 06079fa4..096dca3d 100644 --- a/ascii/distro/ubuntu-gnome +++ b/ascii/distro/ubuntu-gnome @@ -1,18 +1,16 @@ -"\ ${c3} ./o. .oooooooo - .oooo\`\`\`soooo - .oooo\` \`soooo - .ooo\` ${c4}.o.${c3} \`\\/ooo. - :ooo ${c4}:oooo.${c3} \`\\/ooo. - sooo ${c4}\`ooooo${c3} \\/oooo - \\/ooo ${c4}\`soooo${c3} \`ooooo - \`soooo ${c4}\`\\/ooo${c3} \`soooo -${c4}./oo ${c3}\`\\/ooo ${c4}\`/oooo.${c3} \`/ooo -${c4}\`\\/ooo. ${c3}\`/oooo. ${c4}\`/oooo.${c3} \`\` -${c4} \`\\/ooo. ${c3}/oooo ${c4}/ooo\` -${c4} \`ooooo ${c3}\`\` ${c4}.oooo -${c4} \`soooo. .oooo\` - \`\\/oooooooooo\` - \`\`\\/oo\`\` -" + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` diff --git a/ascii/distro/void b/ascii/distro/void index 92d53126..2a089e63 100644 --- a/ascii/distro/void +++ b/ascii/distro/void @@ -1,21 +1,18 @@ -"\ ${c1} __.;=====;.__ _.=+==++=++=+=+===;. -=+++=+===+=+=+++++=_ - . -=:\`\` \`--==+=++==. - _vi, \` --+=++++: + . -=:`` `--==+=++==. + _vi, ` --+=++++: .uvnvi. _._ -==+==+. - .vvnvnI\` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV\$QQmL + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL ${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -\$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -\$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}\`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. \`~+++\` ++|+++ - +vnvnnv, \`-|=== +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. \` + -Invnvvnsi..___..=sv=. ` +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+\` - -~\|{*l}*|\\~ -" - + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ diff --git a/ascii/distro/windows b/ascii/distro/windows index 4dd86003..31564309 100644 --- a/ascii/distro/windows +++ b/ascii/distro/windows @@ -1,18 +1,16 @@ -"\ ${c1} ,.=:!!t3Z3z., :tt:::tt333EE3 ${c1} Et:::ztt33EEEL${c2} @Ee., .., ${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} \$EEEEEttttt33QL +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL ${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^\`\`\`\"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}\`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} \"4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} \`\`${c4} ,..g. +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. ${c3} i::::::::zt33F${c4} AEEEtttt::::ztF ${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 ${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^\`\`\`\"*4E3)${c4} ;EEEtttt:::::tZ\` -${c3} \`${c4} :EEEEtttt::::z7 - \"VEzjt:;;z>*\` -" +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` diff --git a/ascii/distro/windows10 b/ascii/distro/windows10 index 36880dfb..62596129 100644 --- a/ascii/distro/windows10 +++ b/ascii/distro/windows10 @@ -1,4 +1,3 @@ -"\ ${c1} .., ....,,:;+ccllll ...,,+:; cllllllllllllllllll @@ -14,8 +13,7 @@ llllllllllllll lllllllllllllllllll llllllllllllll lllllllllllllllllll llllllllllllll lllllllllllllllllll llllllllllllll lllllllllllllllllll -\`'ccllllllllll lllllllllllllllllll - \`'\\*:: :ccllllllllllllllll - \`\`\`\`''\*::cll - \`\` -" +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` diff --git a/ascii/distro/xubuntu b/ascii/distro/xubuntu index 26eac7cf..b872562b 100644 --- a/ascii/distro/xubuntu +++ b/ascii/distro/xubuntu @@ -1,22 +1,20 @@ -"\ -${c1} \`-/osyhddddhyso/-\` +${c1} `-/osyhddddhyso/-` .+yddddddddddddddddddy+. :yddddddddddddddddddddddddy: -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh\`dddd+ydddo - \`yddddddhshdd- ydddddd+\`ddh.:dddddy\` - sddddddy /d. :dddddd-:dy\`-ddddddds -:ddddddds /+ .dddddd\`yy\`:ddddddddd: -sdddddddd\` . .-:/+ssdyodddddddddds -ddddddddy \`:ohddddddddd + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd dddddddd. +dddddddd sddddddy ydddddds :dddddd+ .oddddddd: sdddddo ./ydddddddds - \`yddddd. \`:ohddddddddddy\` - oddddh/\` \`.:+shdddddddddddddo + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo -ydddddhyssyhdddddddddddddddddy- :yddddddddddddddddddddddddy: .+yddddddddddddddddddy+. - \`-/osyhddddhyso/-\` -" + `-/osyhddddhyso/-` diff --git a/ascii/distro/zorin b/ascii/distro/zorin index cd020de3..bb051669 100644 --- a/ascii/distro/zorin +++ b/ascii/distro/zorin @@ -1,19 +1,17 @@ -"\ -${c1} \`osssssssssssssssssssso\` +${c1} `osssssssssssssssssssso` .osssssssssssssssssssssso. .+oooooooooooooooooooooooo+. - \`::::::::::::::::::::::. .:\` - \`+ssssssssssssssssss+:.\` \`.:+ssso\` -.ossssssssssssssso/. \`-+ossssssso. -ssssssssssssso/-\` \`-/osssssssssssss -.ossssssso/-\` .-/ossssssssssssssso. - \`+sss+:. \`.:+ssssssssssssssssss+\` - \`:. .::::::::::::::::::::::\` + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` .+oooooooooooooooooooooooo+. -osssssssssssssssssssssso- - \`osssssssssssssssssssso\` -" + `osssssssssssssssssssso` diff --git a/neofetch b/neofetch index e0ecb72c..4075bff3 100755 --- a/neofetch +++ b/neofetch @@ -2002,6 +2002,9 @@ getascii() { fi fi + # Set locale to get correct padding + export LC_ALL="$SYS_LOCALE" + # Turn file into variable while IFS=$'\n' read -r line 2>/dev/null; do print+="${line} \n" @@ -2009,7 +2012,6 @@ getascii() { # Calculate size of ascii file in line length / line count. line="${line//\$\{??\}}" line="${line//'\\'/'\'}" - line="${line//█/.}" [[ "${#line}" -gt "${ascii_length:-0}" ]] && ascii_length="${#line}" lines="$((lines+=1))" done < "$ascii" @@ -2022,9 +2024,6 @@ getascii() { print="${print//'${c5}'/$c5}" print="${print//'${c6}'/$c6}" - # Set locale to get correct padding - export LC_ALL="$SYS_LOCALE" - # Overwrite padding if ascii_length_force is set. [[ "$ascii_length_force" ]] && ascii_length="$ascii_length_force" @@ -2941,7 +2940,8 @@ dynamicprompt() { # If the info is higher than the ascii/image place the prompt # based on the info height instead of the ascii/image height. if [[ "${lines:-0}" -lt "${info_height:-0}" ]]; then - lines="-2" + printf "\n" + return else lines="$((lines - info_height))" fi @@ -2954,7 +2954,7 @@ dynamicprompt() { fi # Add some padding - printf "\n\n\n" + printf "\n\n\n\n" } # }}}