luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Config: Remove '--config travis' in favor of '--config path/to/travis'

Browse source
This commit is contained in:
Dylan Araps 2017-01-24 11:48:09 +11:00
parent d68780385f
commit a3c41033d2
2 changed files with 1 additions and 8 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 travis -v - time ./neofetch --ascii --config config/travis -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

7
neofetch
View file

@ -3299,7 +3299,6 @@ get_default_config() {
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"
travis_config="${script_dir%/*}/config/travis"
fi fi
if source "$default_config"; then if source "$default_config"; then
@ -3316,12 +3315,6 @@ get_user_config() {
err "Config: Sourced user config. (${config_file})" err "Config: Sourced user config. (${config_file})"
old_options old_options
return return
elif [[ "$config_file" == "travis" ]]; then
source "$travis_config"
err "Config: Sourced user config. (${travis_config})"
old_options
return
fi fi
mkdir -p "${XDG_CONFIG_HOME}/neofetch/" mkdir -p "${XDG_CONFIG_HOME}/neofetch/"