EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Dylan Araps 2017-07-01 20:58:17 +10:00
parent 2392b2c8c9 b367b24169
commit eeaffac780
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -17,7 +17,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi
script: script:
- time ./neofetch --ascii --config config/travis -v - time ./neofetch --ascii --config config/travis.conf -v
# See this wiki page for why we're disabling these errors. # See this wiki page for why we're disabling these errors.
# https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010; fi

2
config/config → config/config.conf
View File

@ -1,5 +1,3 @@
#!/usr/bin/env bash
#
# Neofetch config file # Neofetch config file
# https://github.com/dylanaraps/neofetch # https://github.com/dylanaraps/neofetch

2
config/travis → config/travis.conf
View File

@ -1,5 +1,3 @@
#!/usr/bin/env bash
#
# Neofetch config file for travis.ci # Neofetch config file for travis.ci
# https://github.com/dylanaraps/neofetch # https://github.com/dylanaraps/neofetch

38
neofetch
View File

@ -1038,6 +1038,7 @@ get_cpu() {
cpu="${cpu//Quad-Core}" cpu="${cpu//Quad-Core}"
cpu="${cpu//Six-Core}" cpu="${cpu//Six-Core}"
cpu="${cpu//Eight-Core}" cpu="${cpu//Eight-Core}"
cpu="${cpu//, * Compute Cores}"
cpu="${cpu//Core}" cpu="${cpu//Core}"
cpu="${cpu//with Radeon * Graphics}" cpu="${cpu//with Radeon * Graphics}"
cpu="${cpu//, altivec supported}" cpu="${cpu//, altivec supported}"
@ -3601,21 +3602,21 @@ get_full_path() {
} }
get_default_config() { get_default_config() {
if [[ -f "/etc/neofetch/config" ]]; then if [[ -f "/etc/neofetch/config.conf" ]]; then
default_config="/etc/neofetch/config" default_config="/etc/neofetch/config.conf"
elif [[ -f "/usr/local/etc/neofetch/config" ]]; then elif [[ -f "/usr/local/etc/neofetch/config.conf" ]]; then
default_config="/usr/local/etc/neofetch/config" default_config="/usr/local/etc/neofetch/config.conf"
elif [[ -f "/data/data/com.termux/files/usr/etc/neofetch/config" ]]; then elif [[ -f "/data/data/com.termux/files/usr/etc/neofetch/config.conf" ]]; then
default_config="/data/data/com.termux/files/usr/etc/neofetch/config" default_config="/data/data/com.termux/files/usr/etc/neofetch/config.conf"
elif [[ -f "/boot/home/config/non-packaged/etc/neofetch/config" ]]; then elif [[ -f "/boot/home/config/non-packaged/etc/neofetch/config.conf" ]]; then
default_config="/boot/home/config/non-packaged/etc/neofetch/config" default_config="/boot/home/config/non-packaged/etc/neofetch/config.conf"
else else
[[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
default_config="${script_dir%/*}/config/config" default_config="${script_dir%/*}/config/config.conf"
fi fi
if source "$default_config"; then if source "$default_config"; then
@ -3640,19 +3641,22 @@ get_user_config() {
if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then
config_file="${XDG_CONFIG_HOME}/neofetch/config" config_file="${XDG_CONFIG_HOME}/neofetch/config"
elif [[ -f "/etc/neofetch/config" ]]; then elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then
cp "/etc/neofetch/config" "${XDG_CONFIG_HOME}/neofetch" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
config_file="${XDG_CONFIG_HOME}/neofetch/config"
elif [[ -f "/usr/local/etc/neofetch/config" ]]; then elif [[ -f "/etc/neofetch/config.conf" ]]; then
cp "/usr/local/share/neofetch/config" "${XDG_CONFIG_HOME}/neofetch" cp "/etc/neofetch/config.conf" "${XDG_CONFIG_HOME}/neofetch"
config_file="${XDG_CONFIG_HOME}/neofetch/config" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
elif [[ -f "/usr/local/etc/neofetch/config.conf" ]]; then
cp "/usr/local/share/neofetch/config.conf" "${XDG_CONFIG_HOME}/neofetch"
config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
else else
[[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
cp "${script_dir%/*}/config/config" "${XDG_CONFIG_HOME}/neofetch" cp "${script_dir%/*}/config/config.conf" "${XDG_CONFIG_HOME}/neofetch"
config_file="${XDG_CONFIG_HOME}/neofetch/config" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
fi fi
source "$config_file" source "$config_file"