From 452e3e665587cf472d39da4655fcb2960f0ceb94 Mon Sep 17 00:00:00 2001 From: Spaghetti Date: Sat, 11 Aug 2012 16:25:16 -0500 Subject: [PATCH 1/8] Fixed OS X used memory detection --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenfetch-dev b/screenfetch-dev index b22841b..ac767e9 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -489,7 +489,7 @@ detectcpu () { detectmem () { if [ "$distro" == "Mac OS X" ]; then totalmem=$(echo "$(sysctl -n hw.memsize)"/1024^2|bc) - usedmem=$(echo "$(sysctl -n hw.usermem)"/1024^2|bc) + usedmem=$(echo "$(top -l 1 | awk '/PhysMem/' | grep -o \[0-9]\*M | tail -2 | head -1)B") else total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) totalmem=$((${total_mem}/1024)) From a0b5b007111d9cf79880aa8f987dadf98e0a0e69 Mon Sep 17 00:00:00 2001 From: Spaghetti Date: Sat, 11 Aug 2012 17:32:46 -0500 Subject: [PATCH 2/8] Attempting to stay up to date with Brett's changes --- screenfetch-dev | 1 + 1 file changed, 1 insertion(+) mode change 100755 => 100644 screenfetch-dev diff --git a/screenfetch-dev b/screenfetch-dev old mode 100755 new mode 100644 index ac767e9..95d4dbc --- a/screenfetch-dev +++ b/screenfetch-dev @@ -489,6 +489,7 @@ detectcpu () { detectmem () { if [ "$distro" == "Mac OS X" ]; then totalmem=$(echo "$(sysctl -n hw.memsize)"/1024^2|bc) + # usedmem=$(echo "$(sysctl -n hw.usermem)"/1024^2|bc) usedmem=$(echo "$(top -l 1 | awk '/PhysMem/' | grep -o \[0-9]\*M | tail -2 | head -1)B") else total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) From 62672fb27a4719bd43422b0b9741c4c55e8e1527 Mon Sep 17 00:00:00 2001 From: Spaghetti Date: Sun, 2 Sep 2012 22:51:06 -0500 Subject: [PATCH 3/8] Getting up to date --- screenfetch-dev | 184 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 145 insertions(+), 39 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 95d4dbc..1dcc668 100644 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # screenFetch # @@ -38,7 +38,7 @@ display_type="ASCII" # WM & DE process names # Removed WM's: compiz -wmnames="fluxbox openbox blackbox xfwm4 metacity kwin icewm pekwm fvwm dwm awesome wmaker stumpwm xmonad musca i3 ratpoison scrotwm spectrwm wmfs wmii beryl subtle e16 enlightenment sawfish emerald monsterwm dminiwm compiz Finder" +wmnames="fluxbox openbox blackbox xfwm4 metacity kwin icewm pekwm fvwm dwm awesome wmaker stumpwm musca i3 xmonad ratpoison scrotwm spectrwm wmfs wmii beryl subtle e16 enlightenment sawfish emerald monsterwm dminiwm compiz Finder" denames="gnome-session xfce-mcs-manage xfce4-session xfconfd ksmserver lxsession gnome-settings-daemon mate-session mate-settings-daemon Finder" # Export theme settings @@ -145,7 +145,7 @@ while getopts ":hsmevVntlS:D:o:Bc:" flags; do echo -e "${underline}Supported Distributions${c0}: Arch Linux (Old and Current Logos), Linux Mint," echo -e " LMDE, Ubuntu, Crunchbang, Debian, Gentoo, Fedora, SolusOS," echo -e " Mandrake/Mandriva, Slackware, Frugalware, openSUSE, Mageia," - echo -e " Peppermint, ParabolaGNU, Viperr, LinuxDeepin, Chakra, and BSD" + echo -e " Peppermint, ParabolaGNU, Viperr, LinuxDeepin, Chakra, and FreeBSD, OpenBSD" echo -e "${underline}Supported Desktop Managers${c0}: KDE, GNOME, XFCE, and LXDE, and Not Present" echo -e "${underline}Supported Window Managers${c0}: PekWM, OpenBox, FluxBox, BlackBox, Xfwm4," echo -e " Metacity, StumpWM, KWin, IceWM, FVWM," @@ -242,11 +242,16 @@ fi # Host and User detection - Begin detecthost () { - myUser=$(echo "$USER") - # net-tools is becoming deprecated - # myHost=$(hostname) - # myHost=$(cat /proc/sys/kernel/hostname) - myHost=$(uname -n) + if [[ "$distro" =~ "BSD" ]]; then + myUser=$(echo "$USER") + myHost=$(hostname) + else + myUser=$(echo "$USER") + # net-tools is becoming deprecated + # myHost=$(hostname) + # myHost=$(cat /proc/sys/kernel/hostname) + myHost=$(uname -n) + fi [[ "$verbosity" -eq "1" ]] && verboseOut "Finding hostname and user...found as '$myUser@$myHost'" } @@ -350,16 +355,18 @@ detectdistro () { fi if [ -f /etc/arch-release ]; then distro="Arch Linux"; fi if [ -f /etc/chakra-release ]; then distro="Chakra"; fi - if [ -f /etc/fedora-release ]; then distro="Fedora"; fi - if [ -f /etc/redhat-release ]; then distro="Red Hat Linux"; fi + if [ -f /etc/fedora-release ] && grep -q "Fedora" /etc/fedora-release; then distro="Fedora"; fi + if [ -f /etc/redhat-release ] && grep -q "Red Hat" /etc/redhat-release; then distro="Red Hat Linux"; fi if [ -f /etc/slackware-version ]; then distro="Slackware"; fi if [ -f /etc/SuSE-release ]; then distro="openSUSE"; fi if [ -f /etc/mageia-release ]; then distro="Mageia"; fi if [ -f /etc/mandrake-release ]; then distro="Mandrake"; fi if [ -f /etc/mandriva-release ]; then distro="Mandriva"; fi - if [ -f /etc/crunchbang-lsb-release ]; then distro="CrunchBang"; fi + if [ -f /etc/crunchbang-lsb-release ] || [ -f /etc/lsb-release-crunchbang ]; then distro="CrunchBang"; fi if [ -f /etc/gentoo-release ]; then distro="Gentoo"; fi - if [ -f /var/run/dmesg.boot ] && grep -i bsd /var/run/dmesg.boot; then distro="BSD"; fi + if [ -f /var/run/dmesg.boot ] && grep -o "FreeBSD" /var/run/dmesg.boot; then distro="FreeBSD"; fi + if [ -f /var/run/dmesg.boot ] && grep -om 1 "DragonFly" /var/run/dmesg.boot; then distro="DragonFlyBSD"; fi + if [ -f /var/run/dmesg.boot ] && grep -o "OpenBSD" /var/run/dmesg.boot; then distro="OpenBSD"; fi if [ -f /usr/share/doc/tc/release.txt ]; then distro="TinyCore"; fi if [ -f /etc/frugalware-release ]; then distro="Frugalware"; fi if [ -f /etc/issue ]; then @@ -386,7 +393,9 @@ detectdistro () { opensuse) distro="openSUSE" ;; ubuntu) distro="Ubuntu" ;; debain) distro="Debian" ;; - bsd) distro="BSD" ;; + freebsd) distro="FreeBSD" ;; + openbsd) distro="OpenBSD" ;; + dragonflybsd) distro="DragonFlyBSD" ;; red*hat*) distro="Red Hat Linux" ;; crunchbang) distro="CrunchBang" ;; gentoo) distro="Gentoo" ;; @@ -439,6 +448,7 @@ detectuptime () { if [ "${days}" -ne "0" ]; then uptime="${days}d ${uptime}" fi + if [[ "$distro" =~ "BSD" ]]; then uptime=$(uptime | awk '{$1=$2=$(NF-6)=$(NF-5)=$(NF-4)=$(NF-3)=$(NF-2)=$(NF-1)=$NF=""; sub(" days","d");sub(",","");sub(":","h ");sub(",","m"); print}'); fi [[ "$verbosity" -eq "1" ]] && verboseOut "Finding current uptime...found as '$uptime'" } # Uptime Detection - End @@ -465,6 +475,7 @@ detectpkgs () { pkgs=$((${pkgs} + ${brew_pkgs})) fi ;; + 'FreeBSD'|'OpenBSD') pkgs=$(pkg_info | wc -l | awk '{sub(" ", "");print $1}') ;; # 'Cygwin') cygfix=2; pkgs=$(($(cygcheck -cd | wc -l)-$cygfix)) ;; esac [[ "$verbosity" -eq "1" ]] && verboseOut "Finding current package count...found as '$pkgs'" @@ -476,6 +487,9 @@ detectpkgs () { # CPU Detection - Begin detectcpu () { if [ "$distro" == "Mac OS X" ]; then cpu=$(echo $(sysctl -n machdep.cpu.brand_string)) + elif [ "$distro" == "FreeBSD" ]; then cpu=$(sysctl -n hw.model) + elif [ "$distro" == "DragonflyBSD" ]; then cpu=$(sysctl -n hw.model) + elif [ "$distro" == "OpenBSD" ]; then cpu=$(sysctl -n hw.model | sed 's/@.*//') else cpu=$(awk -F':' '/model name/{ print $2 }' /proc/cpuinfo | head -n 1 | tr -s " " | sed 's/^ //'); fi # cpu_mhz=$(awk -F':' '/cpu MHz/{ print $2 }' /proc/cpuinfo | head -n 1) # cpu_ghz=$(echo "scale=2; ${cpu_mhz} / 1000" | bc ) @@ -487,20 +501,47 @@ detectcpu () { # Memory Detection - Begin detectmem () { + hw_mem=0 + free_mem=0 + human=1024 if [ "$distro" == "Mac OS X" ]; then - totalmem=$(echo "$(sysctl -n hw.memsize)"/1024^2|bc) + totalmem=$(echo "$(sysctl -n hw.memsize)"/${human}^2|bc) # usedmem=$(echo "$(sysctl -n hw.usermem)"/1024^2|bc) usedmem=$(echo "$(top -l 1 | awk '/PhysMem/' | grep -o \[0-9]\*M | tail -2 | head -1)B") + elif [ "$distro" == "FreeBSD" ]; then + phys_mem=$(sysctl -n hw.physmem) + size_mem=$phys_mem + size_chip=1 + guess_chip=`echo "$size_mem / 8 - 1" | bc` + while [ $guess_chip != 0 ]; do + guess_chip=`echo "$guess_chip / 2" | bc` + size_chip=`echo "$size_chip * 2" | bc` + done + round_mem=`echo "( $size_mem / $size_chip + 1 ) * $size_chip " | bc` + total_mem=$(($round_mem / ($human * $human) )) + pagesize=$(sysctl -n hw.pagesize) + inactive_count=$(sysctl -n vm.stats.vm.v_inactive_count) + inactive_mem=$(($inactive_count * $pagesize)) + cache_count=$(sysctl -n vm.stats.vm.v_cache_count) + cache_mem=$(($cache_count * $pagesize)) + free_count=$(sysctl -n vm.stats.vm.v_free_count) + free_mem=$(($free_count * $pagesize)) + avail_mem=$(($inactive_mem + $cache_mem + $free_mem)) + used_mem=$(($round_mem - $avail_mem)) + usedmem=$(($used_mem / ($human * $human) )) + elif [ "$distro" == "OpenBSD" ]; then + total_mem=$(top -1 1 | awk '/Real:/ {k=split($3,a,"/");print a[k] }' | tr -d 'M') + usedmem=$(top -1 1 | awk '/Real:/ {print $3}' | sed 's/M.*//') else total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) - totalmem=$((${total_mem}/1024)) + totalmem=$((${total_mem}/${human})) if free | grep -q '/cache'; then used_mem=$(free | awk '/cache:/ { print $3 }') - usedmem=$((${used_mem}/1024)) + usedmem=$((${used_mem}/${human})) else free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) used_mem=$((${total_mem} - ${free_mem})) - usedmem=$((${used_mem}/1024)) + usedmem=$((${used_mem}/${human})) fi fi mem="${usedmem}MB / ${totalmem}MB" @@ -520,16 +561,20 @@ detectshell () { # Resolution Detection - Begin detectres () { - if [[ `ps aux` =~ "Finder" ]]; then - res1=$(system_profiler SPDisplaysDataType| awk '/Resolution:/ {print $2}') - res2=$(system_profiler SPDisplaysDataType| awk '/Resolution:/ {print $4}') - xResolution=$(echo $res1"x"$res2) - elif [[ -n $DISPLAY ]]; then - xResolution=$(xdpyinfo | sed -n 's/.*dim.* \([0-9]*x[0-9]*\) .*/\1/pg' | sed ':a;N;$!ba;s/\n/ /g') - # elif [[ "$distro" == "Cygwin" ]]; then - # xResolution="$(scrot --resolution)" + if [[ "$distro" =~ "BSD" ]]; then + xResolution=$(xdpyinfo | sed -n 's/.*dim.* \([0-9]*x[0-9]*\) .*/\1/pg') else - xResolution="No X Server" + if [[ `ps aux` =~ "Finder" ]]; then + res1=$(system_profiler SPDisplaysDataType| awk '/Resolution:/ {print $2}') + res2=$(system_profiler SPDisplaysDataType| awk '/Resolution:/ {print $4}') + xResolution=$(echo $res1"x"$res2) + elif [[ -n $DISPLAY ]]; then + xResolution=$(xdpyinfo | sed -n 's/.*dim.* \([0-9]*x[0-9]*\) .*/\1/pg' | sed ':a;N;$!ba;s/\n/ /g') + # elif [[ "$distro" == "Cygwin" ]]; then + # xResolution="$(scrot --resolution)" + else + xResolution="No X Server" + fi fi [[ "$verbosity" -eq "1" ]] && verboseOut "Finding current resolution(s)...found as '$xResolution'" } @@ -715,19 +760,17 @@ detectgtk () { fi ;; 'GNOME'|'MATE') # Desktop Environment found as "GNOME" - if which gconftool-2 >/dev/null 2>&1; then + # (Gnome 3.0+) + if which gsettings >/dev/null 2>&1; then + gtk2Theme=$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d "'") + gtkIcons=$(gsettings get org.gnome.desktop.interface icon-theme | tr -d "'") + gtkFont=$(gsettings get org.gnome.desktop.interface font-name | tr -d "'") + if [ "$background_detect" == "1" ]; then gtkBackground=$(gsettings get org.gnome.desktop.background picture-uri); fi + elif which gconftool-2 >/dev/null 2>&1; then gtk2Theme=$(gconftool-2 -g /desktop/gnome/interface/gtk_theme) - fi - - if which gconftool-2 >/dev/null 2>&1; then gtkIcons=$(gconftool-2 -g /desktop/gnome/interface/icon_theme) - fi - - if which gconftool-2 >/dev/null 2>&1; then gtkFont=$(gconftool-2 -g /desktop/gnome/interface/font_name) - fi - if [ "$background_detect" == "1" ]; then - if which gconftool-2 >/dev/null 2>&1; then + if [ "$background_detect" == "1" ]; then gtkBackgroundFull=$(gconftool-2 -g /desktop/gnome/background/picture_filename) gtkBackground=$(echo "$gtkBackgroundFull" | awk -F"/" '{print $NF}') fi @@ -823,6 +866,7 @@ detectgtk () { #if [ $(which gsettings) ] && [ "$distro" != "Mac OS X" ]; then # gtk3Theme="$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d \"\'\")" #fi + if [[ -x $(which gsettings) ]]; then gtk3Theme=$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d "'"); fi # ROX-Filer icon detect only if [ -a ${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options ]; then @@ -1127,7 +1171,7 @@ asciiText () { "$c2 :--------------------://") ;; - "BSD") + "FreeBSD") c1="\e[1;37m" # Red c2="\e[1;31m" # Light Red if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi @@ -1151,6 +1195,68 @@ asciiText () { ) ;; + "OpenBSD") + c1="\e[1;33m" # Light Yellow + c2="\e[0;33m" # Bold Yellow + c3="\e[1;36m" # Light Cyan + c4="\e[1;31m" # Light Red + c5="\e[1;37m" + c6="\e[1;30m" + if [ -n "${my_lcolor}" ]; then c1="$my_lcolor"; c2="${my_color}"; fi + startline="5" + fulloutput=( + " "$c3" _ " +" "$c3"(_) " +""$c1" | . " +""$c1" . |L /| . "$c3" _ " +""$c1" _ . |\ _| \--+._/| . "$c3"(_) " +""$c1" / ||\| Y J ) / |/| ./ %s" # Host +""$c1" J |)'( | \` F\`.'/ "$c3" _ %s" # OS +""$c1" -<| F __ .-< "$c3"(_) %s" # Kernel +""$c1" | / .-'"$c3". "$c1"\`. /"$c3"-. "$c1"L___ %s" # Uptime +""$c1" J \ < "$c3"\ "$c1" | | "$c6"O"$c3"\\\\"$c1"|.-' "$c3" _ %s" # Package +""$c1" _J \ .- \\\\"$c3"/ "$c6"O "$c3"| "$c1"| \ |"$c1"F "$c3"(_) %s" # Shell +""$c1" '-F -<_. \ .-' \`-' L__ %s" +""$c1"__J _ _. >-' "$c2")"$c4"._. "$c1"|-' %s " +""$c1" \`-|.' /_. "$c4"\_| "$c1" F %s " +""$c1" /.- . _.< %s" +""$c1" /' /.' .' \`\ %s" +""$c1" /L /' |/ _.-'-\ %s " +""$c1" /'J ___.---'\| %s" +""$c1" |\ .--' V | \`. \` %s " +""$c1" |/\`. \`-. \`._) %s" +""$c1" / .-.\ %s" +""$c1" \ ( \`\ " +""$c1" \`.\ " +) + ;; + + "DragonFlyBSD") + c1="\e[1;31m" # Red + c2="\e[1;37m" # White + c3="\e[1;33m" # + c4="\e[0;31m" + startline="0" + fulloutput=(" "$c1" | %s" +" "$c1" .-. %s" +" "$c3" ()"$c1"I"$c3"() %s" +" "$c1" \"==.__:-:__.==\" %s" +" "$c1"\"==.__/~|~\__.==\" %s" +" "$c1"\"==._( Y )_.==\" %s" +" "$c2".-'~~\"\"~=--...,__"$c1"\/|\/"$c2"__,...--=~\"\"~~'-. %s" +" "$c2"( ..="$c1"\\\\="$c1"/"$c2"=.. )%s" +" "$c2"\`'-. ,.-\"\`;"$c1"/=\\\\"$c2" ;\"-.,_ .-'\`%s" +" "$c2" \`~\"-=-~\` .-~\` "$c1"|=|"$c2" \`~-. \`~-=-\"~\` %s" +" "$c2" .-~\` /"$c1"|=|"$c2"\ \`~-. %s" +" "$c2" .~\` / "$c1"|=|"$c2" \ \`~. %s" +" "$c2" .-~\` .' "$c1"|=|"$c2" \\\\\`. \`~-. %s" +" "$c2" (\` _,.-=\"\` "$c1" |=|"$c2" \`\"=-.,_ \`) %s" +" "$c2" \`~\"~\"\` "$c1" |=|"$c2" \`\"~\"~\` %s" +" "$c1" /=\ %s" +" "$c1" \=/ %s" +" "$c1" ^ %s" +) + ;; "Mandriva"|"Mandrake") c1="\e[1;34m" # Light Blue @@ -1610,8 +1716,8 @@ infoDisplay () { case $distro in "Arch Linux - Old"|"Fedora"|"Mandriva"|"Mandrake"|"Chakra") labelcolor="\e[1;34m";; "Arch Linux"|"Frugalware"|"Mageia") labelcolor="\e[1;36m";; - "Mint"|"LMDE"|"openSUSE"|"LinuxDeepin") labelcolor="\e[1;32m";; - "Ubuntu"|"Debian"|"BSD"|"Red Hat Linux"|"Peppermint"|"Cygwin"|"Fuduntu") labelcolor="\e[1;31m";; + "Mint"|"LMDE"|"openSUSE"|"LinuxDeepin"|"DragonflyBSD") labelcolor="\e[1;32m";; + "Ubuntu"|"FreeBSD"|"Debian"|"BSD"|"Red Hat Linux"|"Peppermint"|"Cygwin"|"Fuduntu") labelcolor="\e[1;31m";; "CrunchBang"|"SolusOS"|"Viperr") labelcolor="\e[1;30m";; "Gentoo"|"ParabolaGNU/Linux-libre") labelcolor="\e[1;35m";; "Slackware") labelcolor="\e[1;34m";; From ee69743a3163b7758b7652782f923da5a956e8b6 Mon Sep 17 00:00:00 2001 From: Spaghetti Date: Sun, 2 Sep 2012 22:52:54 -0500 Subject: [PATCH 4/8] Added mediocre Trisquel support --- screenfetch-dev | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 1dcc668..1a83f86 100644 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env bash # # screenFetch # @@ -272,6 +272,7 @@ detectdistro () { distro_codename=null distro_release=null fi + if [ "$distro_detect" == "Trisquel" ]; then distro="Trisquel"; fi if [ "$distro_detect" == "LinuxMint" ]; then distro="Mint" if [ "$(lsb_release -c | sed -e 's/Codename://' -e 's/\t//g')" == "debian" ]; then distro="LMDE" @@ -460,7 +461,7 @@ detectpkgs () { case $distro in 'Arch Linux'|'ParabolaGNU/Linux-libre'|'Chakra') pkgs=$(pacman -Qq | wc -l) ;; 'Frugalware') pkgs=$(pacman-g2 -Q | wc -l) ;; - 'Fuduntu'|'Ubuntu'|'Mint'|'SolusOS'|'Debian'|'LMDE'|'CrunchBang'|'Peppermint'|'LinuxDeepin') pkgs=$(dpkg --get-selections | wc -l) ;; + 'Fuduntu'|'Ubuntu'|'Mint'|'SolusOS'|'Debian'|'LMDE'|'CrunchBang'|'Peppermint'|'LinuxDeepin'|'Trisquel') pkgs=$(dpkg --get-selections | wc -l) ;; 'Slackware') pkgs=$(ls -1 /var/log/packages | wc -l) ;; 'Gentoo') pkgs=$(ls -d /var/db/pkg/*/* | wc -l) ;; 'Fedora'|'openSUSE'|'Red Hat Linux'|'Mandriva'|'Mandrake'|'Mageia'|'Viperr') pkgs=$(rpm -qa | wc -l) ;; @@ -792,6 +793,8 @@ detectgtk () { 'LXDE') if [ -f ${XDG_CONFIG_HOME:-${HOME}/.config}/lxde/config ]; then lxdeconf="/lxde/config" + elif [ $distro == "Trisquel" ]; then + lxdeconf="" else lxdeconf="/lxsession/LXDE/desktop.conf" fi @@ -1650,6 +1653,31 @@ asciiText () { "${c4} \"VEzjt:;;z>*\` %s") ;; + "Trisquel") + c1="\e[1;34m" # Light Blue + c2="\e[1;36m" # Blue + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi + startline="1" + fulloutput=( +"${c1} ▄▄▄▄▄▄ " +"${c1} ▄█████████▄ %s" +"${c1} ▄▄▄▄▄▄ ████▀ ▀████ %s" +"${c1} ▄██████████▄ ████▀ ▄▄ ▀███ %s" +"${c1} ▄███▀▀ ▀▀████ ███▄ ▄█ ███ %s" +"${c1} ▄███ ▄▄▄ ████▄ ▀██████ ▄███ %s" +"${c1} ███ █▀▀██▄ █████▄ ▀▀ ▄████ %s" +"${c1} ▀███ ███ ███████▄▄ ▄▄██████ %s" +"${c1} ▀███▄ ▄███ █████████████${c2}████▀ %s" +"${c1} ▀█████████ ███████${c2}███▀▀▀ %s" +"${c1} ▀▀███▀▀ ██${c2}████▀▀ %s" +"${c2} ██████▀ ▄▄▄▄ %s" +"${c2} █████▀ ████████ %s" +"${c2} █████ ███▀ ▀███ %s" +"${c2} ████▄ ██▄▄▄ ███ %s" +"${c2} █████▄ ▀▀ ▄██ %s" +"${c2} ██████▄▄▄████ %s" +"${c2} ▀▀█████▀▀ ") + ;; *) c1="\e[1;37m" # White @@ -1721,7 +1749,7 @@ infoDisplay () { "CrunchBang"|"SolusOS"|"Viperr") labelcolor="\e[1;30m";; "Gentoo"|"ParabolaGNU/Linux-libre") labelcolor="\e[1;35m";; "Slackware") labelcolor="\e[1;34m";; - "Mac OS X") labelcolor="\033[1;34m";; + "Mac OS X"|"Trisquel") labelcolor="\033[1;34m";; *) labelcolor="\e[1;33m";; esac [[ "$my_lcolor" ]] && labelcolor="${my_lcolor}" From 603a0d38fb35edca566f6368f34eb9e8e5fc1938 Mon Sep 17 00:00:00 2001 From: Spaghetti Date: Sun, 2 Sep 2012 22:59:31 -0500 Subject: [PATCH 5/8] While we're at it, let's fix that OS X memory detection bug I introduced --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenfetch-dev b/screenfetch-dev index 1a83f86..49bcd97 100644 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -508,7 +508,7 @@ detectmem () { if [ "$distro" == "Mac OS X" ]; then totalmem=$(echo "$(sysctl -n hw.memsize)"/${human}^2|bc) # usedmem=$(echo "$(sysctl -n hw.usermem)"/1024^2|bc) - usedmem=$(echo "$(top -l 1 | awk '/PhysMem/' | grep -o \[0-9]\*M | tail -2 | head -1)B") + usedmem=$(echo "$(top -l 1 | awk '/PhysMem/' | grep -o \[0-9]\*'M used' | grep -o \[0-9]\*)") elif [ "$distro" == "FreeBSD" ]; then phys_mem=$(sysctl -n hw.physmem) size_mem=$phys_mem From 997859f131d334ed040c81b930e35136da3fbe72 Mon Sep 17 00:00:00 2001 From: Brett Bohnenkamper Date: Thu, 6 Sep 2012 03:12:38 -0500 Subject: [PATCH 6/8] Revert "Fix CrunchBang detection, gsettings error output." This reverts commit ca524b93fcb2b75977466087ee0a01d28676ba69. --- screenfetch-dev | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index f26bdf2..502781a 100644 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -367,7 +367,7 @@ detectdistro () { if [ -f /etc/mageia-release ]; then distro="Mageia"; fi if [ -f /etc/mandrake-release ]; then distro="Mandrake"; fi if [ -f /etc/mandriva-release ]; then distro="Mandriva"; fi - if [ -f /etc/crunchbang-lsb-release ] || [ -f /etc/lsb-release-crunchbang ]; then distro="CrunchBang"; fi + if [ -f /etc/crunchbang-lsb-release ]; then distro="CrunchBang"; fi if [ -f /etc/gentoo-release ]; then distro="Gentoo"; fi if [ -f /var/run/dmesg.boot ] && grep -o "FreeBSD" /var/run/dmesg.boot; then distro="FreeBSD"; fi if [ -f /var/run/dmesg.boot ] && grep -om 1 "DragonFly" /var/run/dmesg.boot; then distro="DragonFlyBSD"; fi @@ -877,7 +877,7 @@ detectgtk () { #if [ $(which gsettings) ] && [ "$distro" != "Mac OS X" ]; then # gtk3Theme="$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d \"\'\")" #fi - if [[ -x $(which gsettings) ]]; then gtk3Theme=$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d "'"); fi + if [ -x $(which gsettings) ]; then gtk3Theme=$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d "'"); fi # ROX-Filer icon detect only if [ -a ${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options ]; then From c1d422e50acaae9b644b4b57ceaeb32559adc5d3 Mon Sep 17 00:00:00 2001 From: Brett Bohnenkamper Date: Thu, 6 Sep 2012 03:16:35 -0500 Subject: [PATCH 7/8] Fixing my STUPIDITY with merge. I can't into GIT hard enough, apparently. --- screenfetch-dev | 8 -------- 1 file changed, 8 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 502781a..560d720 100644 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1,8 +1,4 @@ -<<<<<<< HEAD -#!/usr/bin/env bash -======= #!/usr/bin/env bash ->>>>>>> spaghetti2514/master # # screenFetch # @@ -512,11 +508,7 @@ detectmem () { if [ "$distro" == "Mac OS X" ]; then totalmem=$(echo "$(sysctl -n hw.memsize)"/${human}^2|bc) # usedmem=$(echo "$(sysctl -n hw.usermem)"/1024^2|bc) -<<<<<<< HEAD - usedmem=$(echo "$(top -l 1 | awk '/PhysMem/' | grep -o \[0-9]\*M | tail -2 | head -1)B") -======= usedmem=$(echo "$(top -l 1 | awk '/PhysMem/' | grep -o \[0-9]\*'M used' | grep -o \[0-9]\*)") ->>>>>>> spaghetti2514/master elif [ "$distro" == "FreeBSD" ]; then phys_mem=$(sysctl -n hw.physmem) size_mem=$phys_mem From 31e18ac713a4d06e63b97ff1f971b18ea51f473f Mon Sep 17 00:00:00 2001 From: Brett Bohnenkamper Date: Thu, 6 Sep 2012 03:17:51 -0500 Subject: [PATCH 8/8] Urp? --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 screenfetch-dev diff --git a/screenfetch-dev b/screenfetch-dev old mode 100644 new mode 100755 index 560d720..356e2c1 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env bash # # screenFetch #