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

General: Expand full path detection to --config

This commit is contained in:
Dylan Araps 2017-01-18 16:42:27 +11:00
parent b9ee2f1ce1
commit 7d20f75e2e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neofetch
View File

@ -2017,7 +2017,7 @@ get_ascii() {
else else
[[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
ascii_dir="${script_dir}/ascii/distro" ascii_dir="${script_dir%/*}/ascii/distro"
fi fi
image_source="${ascii_dir}/${ascii_file}" image_source="${ascii_dir}/${ascii_file}"
@ -2059,7 +2059,7 @@ get_ascii() {
get_image_source() { get_image_source() {
case "$image_source" in case "$image_source" in
"auto" | "wall"*) "auto" | "wallpaper")
get_wallpaper 2>/dev/null get_wallpaper 2>/dev/null
;; ;;
@ -3258,7 +3258,7 @@ get_full_path() {
# For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers"
# If the file exists in the current directory, stop here. # If the file exists in the current directory, stop here.
[[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } [[ -f "${PWD}/${1%/*}" ]] && { printf "%s\n" "${PWD}/${1%/*}"; return; }
if ! cd "${1%/*}"; then if ! cd "${1%/*}"; then
err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" err "Error: Directory '${1%/*}' doesn't exist or is inaccessible"
@ -3290,8 +3290,8 @@ 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" travis_config="${script_dir%/*}/config/travis"
fi fi
if source "$default_config"; then if source "$default_config"; then
@ -3333,7 +3333,7 @@ get_user_config() {
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" "${XDG_CONFIG_HOME}/neofetch"
config_file="${XDG_CONFIG_HOME}/neofetch/config" config_file="${XDG_CONFIG_HOME}/neofetch/config"
fi fi
@ -4000,7 +4000,10 @@ get_args() {
"--config") "--config")
case "$2" in case "$2" in
"none" | "off" | "") ;; "none" | "off" | "") ;;
*) config_file="$2"; get_user_config 2>/dev/null ;; *)
config_file="$(get_full_path "$2")"
get_user_config 2>/dev/null
;;
esac esac
;; ;;
"-v") verbose="on" ;; "-v") verbose="on" ;;