Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
neofetch
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
neofetch
Commits
a3c41033
Commit
a3c41033
authored
Jan 24, 2017
by
Dylan Araps
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Config: Remove '--config travis' in favor of '--config path/to/travis'
parent
d6878038
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
.travis.yml
.travis.yml
+1
-1
neofetch
neofetch
+0
-7
No files found.
.travis.yml
View file @
a3c41033
...
@@ -17,7 +17,7 @@ before_install:
...
@@ -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
neofetch
View file @
a3c41033
...
@@ -3299,7 +3299,6 @@ get_default_config() {
...
@@ -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() {
...
@@ -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/
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment