Merge pull request #1 from dylanaraps/master

Merge All
This commit is contained in:
Takeya Yuki 2017-05-17 14:03:15 +08:00 committed by GitHub
commit 62e0d5e6bb
5 changed files with 66 additions and 16 deletions

View File

@ -5,6 +5,13 @@
- **[@erikdubois](https://github.com/erikdubois)** - **[@erikdubois](https://github.com/erikdubois)**
- **[@mstraube](https://github.com/mstraube)** - **[@mstraube](https://github.com/mstraube)**
- **[@Artoriuz](https://github.com/Artoriuz)** - **[@Artoriuz](https://github.com/Artoriuz)**
- **[@WilsonRU](https://github.com/WilsonRU)**
## Operating System
- Added support for Arch XFerience. **[@mstraube](https://github.com/mstraube)**
- Added support for Maui. **[@mstraube](https://github.com/mstraube)**
## General ## General
@ -25,6 +32,7 @@
- Added Ubuntu-MATE ascii art. - Added Ubuntu-MATE ascii art.
- Fixed ArchLabs ascii art. **[@erikdubois](https://github.com/erikdubois)** - Fixed ArchLabs ascii art. **[@erikdubois](https://github.com/erikdubois)**
- Updated GoboLinux ascii art. **[@WilsonRU](https://github.com/WilsonRU)**
## Info ## Info

View File

@ -0,0 +1,19 @@
${c1} ``--:::::::-.`
.-/+++ooooooooo+++:-`
`-/+oooooooooooooooooo++:.
-/+oooooo/+ooooooooo+/ooo++:`
`/+oo++oo. .+oooooo+.-: +:-o+-
`/+o/. -o. :oooooo+ ```:.+oo+-
`:+oo- -/` :oooooo+ .`-`+oooo/.
.+ooo+. .` `://///+-+..oooooo+:`
-+ooo:` ``.-+oooooo+/`
-+oo/` :+oooo/.
.+oo: ..-/. . -+oo+/`
`/++- -:::++::/. -+oo+-
./o: `:///+- `./ooo+:`
.++- `` /-` -:/+oooo+:`
.:+/:`` `-:ooooooo++-
./+o+//:...../+oooooooo++:`
`:/++ooooooooooooo++/-`
`.-//++++++//:-.`
``````

View File

@ -1,13 +1,6 @@
${c1}+Nhsssss. `MM: ${c1}_____ _
${c2}MM/ ./:::/- `MMo::// ./:::/- / ____| | |
MM/-osdd-+mm---hNs`MM+--/Md.omd---dmo | | __ ___ | |__ ___
${c3}MM/ `MM:sMm yMh`MM: .MM-yMh hMy | | |_ |/ _ \| '_ \ / _ \
mM+..-MM:oNm...hNy`MM/..:Mm.sNd...dNs | |__| | (_) | |_) | (_) |
${c4}`+++++oo.`-o++++:``oo++++o` `:o+++o:` \_____|\___/|_.__/ \___/
${c1}oo- :o+
${c2}MM/ /yo
MM/ +mh mmyoosm/`+mh omy`od+..+mo
${c3}MM/ sMm MM/ `MM:sMm yMh -dmmm:
MM/ sMm MM/ `MM:sMm yMh .hNNm.
${c4}MMhsssss.sMm MM/ `MM:-yNsssmMh`sNs-.sMs

20
ascii/distro/maui Normal file
View File

@ -0,0 +1,20 @@
${c1} `.-://////:--`
.:/oooooooooooooooo+:.
`:+ooooooooooooooooooooooo:`
`:oooooooooooooooooooooooooooo/`
..```-oooooo/-`` `:oooooo+:.` `--
:. +oo+-` /ooo/` -/
-o. `o+- +o/` -o:
`oo` ::` :o/ `+. .+o` /oo.
/o+ . -+oo- ` /oo/ `ooo/
+o- /ooo+` .+ooo. :ooo+
++ .+oooo: -oooo+ `oooo+
:. .oooooo` :ooooo- :oooo:
` .oooooo: :ooooo+ `ooo+-`
.+oooooo` -oooooo: `o/-
+oooooo: .ooooooo.
/ooooooo` /ooooooo/ ..
`:oooooooo/:::/ooooooooo+:--:/:`
`:+oooooooooooooooooooooo+:`
.:+oooooooooooooooo+:.
`.-://////:-.`

View File

@ -2533,7 +2533,7 @@ display_image() {
printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\ printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\
"${w3m_img_path:-false}" -bg "$background_color" >/dev/null & 2>&1 || to_off "Image: w3m-img failed to display the image." "${w3m_img_path:-false}" -bg "$background_color" >/dev/null & 2>&1 || to_off "Image: w3m-img failed to display the image."
zws=" " zws="\xE2\x80\x8B\x20"
;; ;;
esac esac
} }
@ -2740,11 +2740,11 @@ get_underline() {
get_line_break() { get_line_break() {
# Print it directly. # Print it directly.
printf "%s\n" "${zws}" printf "%b\n" "${zws}"
# Calculate info height. # Calculate info height.
((++info_height)) ((++info_height))
line_breaks+=$'\n' line_breaks+="\n"
# Tell info() that we printed manually. # Tell info() that we printed manually.
prin=1 prin=1
@ -2867,6 +2867,11 @@ get_distro_colors() {
ascii_file="archlabs" ascii_file="archlabs"
;; ;;
*"XFerience"*)
set_colors 6 6 7 1
ascii_file="arch_xferience"
;;
"Arch"*) "Arch"*)
set_colors 6 6 7 1 set_colors 6 6 7 1
ascii_file="arch" ascii_file="arch"
@ -3097,6 +3102,11 @@ get_distro_colors() {
ascii_file="manjaro" ascii_file="manjaro"
;; ;;
"Maui"*)
set_colors 6 7
ascii_file="maui"
;;
"Mer"*) "Mer"*)
set_colors 4 7 1 set_colors 4 7 1
ascii_file="mer" ascii_file="mer"