Merge pull request #518 from dylanaraps/cache3

Cache: Simplify caching
This commit is contained in:
Dylan Araps 2016-12-12 13:23:06 +11:00 committed by GitHub
commit 639537aef3
1 changed files with 12 additions and 11 deletions

View File

@ -976,10 +976,16 @@ get_gpu() {
;; ;;
"Mac OS X") "Mac OS X")
if [[ -f "${cache_dir}/neofetch/gpu" ]]; then
source "${cache_dir}/neofetch/gpu"
else
gpu="$(system_profiler SPDisplaysDataType | awk -F': ' '/^\ *Chipset Model:/ {printf $2 ", "}')" gpu="$(system_profiler SPDisplaysDataType | awk -F': ' '/^\ *Chipset Model:/ {printf $2 ", "}')"
gpu="${gpu//'/ $'}" gpu="${gpu//'/ $'}"
gpu="${gpu%,*}" gpu="${gpu%,*}"
cache "gpu" "$gpu" cache "gpu" "$gpu"
fi
;; ;;
"iPhone OS") "iPhone OS")
@ -2426,13 +2432,8 @@ info() {
# $1 is the subtitle # $1 is the subtitle
subtitle="$1" subtitle="$1"
# Use cache if it exists
if [[ -f "${cache_dir}/neofetch/${2}" ]]; then
source "${cache_dir}/neofetch/${2}"
else
# Call the function. # Call the function.
"get_${2:-$1}" 2>/dev/null "get_${2:-$1}" 2>/dev/null
fi
# Update the variable # Update the variable
output="${2:-$1}" output="${2:-$1}"