Commit 3a0c82eb authored by Dylan Araps's avatar Dylan Araps

Merge branch 'master' of https://github.com/dylanaraps/neofetch

parents 2b3940ad d2e82bc2
## Contributors ## Contributors
- **[@konimex](https://github.com/konimex)**
- **[@fornwall](https://github.com/fornwall)**
## Packages ## Packages
...@@ -9,6 +11,8 @@ ...@@ -9,6 +11,8 @@
## General ## General
- [Cursor Position] Fix cursor position in URxvt when using terminal padding. - [Cursor Position] Fix cursor position in URxvt when using terminal padding.
- [Termux] Fix default ascii location. **[@konimex](https://github.com/konimex)**
- [Termux] Fix default config location. **[@fornwall](https://github.com/fornwall)**
## Operating System ## Operating System
......
...@@ -2716,6 +2716,9 @@ getdefaultconfig() { ...@@ -2716,6 +2716,9 @@ getdefaultconfig() {
elif [ -f "/usr/local/share/neofetch/config" ]; then elif [ -f "/usr/local/share/neofetch/config" ]; then
default_config="/usr/local/share/neofetch/config" default_config="/usr/local/share/neofetch/config"
elif [ -f "/data/data/com.termux/files/usr/share/neofetch/config" ]; then
default_config="/data/data/com.termux/files/usr/share/neofetch/config"
else else
getscriptdir getscriptdir
default_config="${script_dir}/config/config" default_config="${script_dir}/config/config"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment