From 26495ccab5d397a0196df2d84c4a57cf4f4a12ed Mon Sep 17 00:00:00 2001 From: dylan araps Date: Tue, 5 Jan 2016 18:56:05 +1100 Subject: [PATCH] getdistro now runs at the start of the script with getos so we can use it in detection --- fetch.sh | 86 +++++++++++++++++++++++++++----------------------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/fetch.sh b/fetch.sh index d527dee4..a0e6520e 100755 --- a/fetch.sh +++ b/fetch.sh @@ -229,59 +229,57 @@ case "$(uname)" in esac # Get Distro -getdistro () { - case "$os" in - "Linux" ) - if type -p crux >/dev/null 2>&1; then - distro="CRUX" - else - distro="$(grep -h '^NAME=' /etc/*ease)" - distro=${distro#NAME\=\"*} - distro=${distro%*\"} - fi - ;; +case "$os" in + "Linux" ) + if type -p crux >/dev/null 2>&1; then + distro="CRUX" + else + distro="$(grep -h '^NAME=' /etc/*ease)" + distro=${distro#NAME\=\"*} + distro=${distro%*\"} + fi + ;; - "Mac OS X") - distro="Mac OS X $(sw_vers -productVersion)" - ;; + "Mac OS X") + distro="Mac OS X $(sw_vers -productVersion)" + ;; - "OpenBSD") - distro="OpenBSD" - ;; + "OpenBSD") + distro="OpenBSD" + ;; - "Windows") - case "$(cmd /c ver)" in - *"XP"*) - distro="Windows XP" - ;; + "Windows") + case "$(cmd /c ver)" in + *"XP"*) + distro="Windows XP" + ;; - *"7"*) - distro="Windows 7" - ;; + *"7"*) + distro="Windows 7" + ;; - *"8.1"*) - distro="Windows 8.1" - ;; + *"8.1"*) + distro="Windows 8.1" + ;; - *"8"*) - distro="Windows 8" - ;; + *"8"*) + distro="Windows 8" + ;; - *"10"*) - distro="Windows 10" - ;; + *"10"*) + distro="Windows 10" + ;; - *) - distro="Windows" - ;; - esac - ;; + *) + distro="Windows" + ;; + esac + ;; - *) - distro="Unknown" - ;; - esac -} + *) + distro="Unknown" + ;; +esac # Get Title gettitle () {