From a3c41033d2a3c5708c646a7f04c6b597bdc51217 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 24 Jan 2017 11:48:09 +1100 Subject: [PATCH] Config: Remove '--config travis' in favor of '--config path/to/travis' --- .travis.yml | 2 +- neofetch | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 945902a7..f2566128 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi 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. # 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 diff --git a/neofetch b/neofetch index e6fd4520..cdd30575 100755 --- a/neofetch +++ b/neofetch @@ -3299,7 +3299,6 @@ get_default_config() { else [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" default_config="${script_dir%/*}/config/config" - travis_config="${script_dir%/*}/config/travis" fi if source "$default_config"; then @@ -3316,12 +3315,6 @@ get_user_config() { err "Config: Sourced user config. (${config_file})" old_options return - - elif [[ "$config_file" == "travis" ]]; then - source "$travis_config" - err "Config: Sourced user config. (${travis_config})" - old_options - return fi mkdir -p "${XDG_CONFIG_HOME}/neofetch/"