Hello community, here is the log from the commit of package screenfetch for openSUSE:Factory checked in at 2017-02-06 15:24:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screenfetch (Old) and /work/SRC/openSUSE:Factory/.screenfetch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "screenfetch" Changes: -------- --- /work/SRC/openSUSE:Factory/screenfetch/screenfetch.changes 2016-10-10 16:25:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.screenfetch.new/screenfetch.changes 2017-02-06 15:24:14.514324157 +0100 @@ -1,0 +2,15 @@ +Sun Jan 29 20:12:27 UTC 2017 - mpluskal@suse.com + +- Update to version 3.7.0+git.20170127: + * Add SwagArch to detectpkgs() + * Add SwagArch to infoDisplay() + * New distro: Parrot Security (close #425) + * add GrombyangOS distro + * Fixed RAM display, corrected OpenBSD section for sub-100MiB output. + * Added OpenBSD kernel version detection. + * Patch number added to OpenBSD kernel version. + * Install instructions: Fedora now uses DNF + * screenfetch-dev: fixed theme & font name for BunsenLabs desktop. + * screenfetch-dev: added GTK3 theme detection for BunsenLabs. + +------------------------------------------------------------------- Old: ---- screenfetch-3.7.0+git.20161002.tar.xz New: ---- _servicedata screenfetch-3.7.0+git.20170127.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screenfetch.spec ++++++ --- /var/tmp/diff_new_pack.rHZqce/_old 2017-02-06 15:24:14.938263574 +0100 +++ /var/tmp/diff_new_pack.rHZqce/_new 2017-02-06 15:24:14.950261859 +0100 @@ -1,7 +1,7 @@ # # spec file for package screenfetch # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,18 @@ Name: screenfetch -Version: 3.7.0+git.20161002 +Version: 3.7.0+git.20170127 Release: 0 Summary: Fetches system/theme information in terminal for Linux desktop screenshots License: GPL-3.0 Group: System/X11/Terminals Url: https://github.com/KittyKatt/screenFetch Source0: %{name}-%{version}.tar.xz -BuildRequires: xz Requires: bash Requires: xprop Recommends: curl Recommends: scrot Recommends: xdpyinfo -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -49,8 +47,10 @@ %build %install -install -D -p -m 0755 %{name}-dev %{buildroot}%{_bindir}/%{name} -install -D -p -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +install -D -p -m 0755 %{name}-dev \ + %{buildroot}%{_bindir}/%{name} +install -D -p -m 0644 %{name}.1 \ + %{buildroot}%{_mandir}/man1/%{name}.1 %files %defattr(-,root,root) ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/KittyKatt/screenFetch.git</param> <param name="changesrevision">2961b74746ee599473edbd879dca37f8ebf7f02a</param></service></servicedata>++++++ screenfetch-3.7.0+git.20161002.tar.xz -> screenfetch-3.7.0+git.20170127.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenfetch-3.7.0+git.20161002/CHANGELOG new/screenfetch-3.7.0+git.20170127/CHANGELOG --- old/screenfetch-3.7.0+git.20161002/CHANGELOG 2016-10-02 04:07:12.000000000 +0200 +++ new/screenfetch-3.7.0+git.20170127/CHANGELOG 2017-01-27 12:54:38.000000000 +0100 @@ -3,6 +3,7 @@ changelog **** **** **** **** + - Added Fux logo - Enable easily addable custom lines through customlines() function - Line wrapping with '-w' command line option - Fix issue with extra space and host variable @@ -17,8 +18,10 @@ - Display release version and package count on TinyCore Linux - Display exact release version on Windows 10 - Use modern logo on Windows 10 and Windows 8 + - Support for Blackbox on Windows + - Improve BusyBox shell detection - Added detection for Trinity/TWin, chromeos-wm, FLWM, howm, sway, LXQt and Deepin [DEs/WMs] - - Added detection for Alpine, BunsenLabs, Chrome OS, Chromium OS, Devuan, KDE neon, Kogaion, Mer, Msys, Netrunner, Oracle Linux, PCLinuxOS, Qubes OS , Red Star OS, ROSA, SailfishOS, SteamOS and SUSE Linux Enterprise + - Added detection for Alpine, BunsenLabs, Chrome OS, Chromium OS, Devuan, KDE neon, Kogaion, Mer, Msys, Netrunner, Oracle Linux, PCLinuxOS, Qubes OS , Pardus, Red Star OS, ROSA, SailfishOS, SparkyLinux, SteamOS, SUSE Linux Enterprise and SwagArch v3.7.0 - Show RAM in IEC units (MiB instead of MB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenfetch-3.7.0+git.20161002/README.mkdn new/screenfetch-3.7.0+git.20170127/README.mkdn --- old/screenfetch-3.7.0+git.20161002/README.mkdn 2016-10-02 04:07:12.000000000 +0200 +++ new/screenfetch-3.7.0+git.20170127/README.mkdn 2017-01-27 12:54:38.000000000 +0100 @@ -1,3 +1,4 @@ + # screenFetch - The Bash Screenshot Information Tool ## What is screenFetch? @@ -39,20 +40,21 @@ 1. Emerge screenfetch from portage using `emerge screenfetch` 2. Sabayon users can install screenfetch from entropy using `equo install screenfetch` -### Ubuntu (>14.04) and Debian (stable/testing/unstable) +### Ubuntu and Debian (stable/testing/unstable) -1. Install: `apt-get install screenfetch` -2. There is also a PPA for Ubuntu located at https://launchpad.net/%7Edjcj/+archive/ubuntu/screenfetch +1. Ubuntu 16.04+: `sudo apt install screenfetch` +2. 14.04 or Debian: `sudo apt-get install screenfetch` +3. There is also a PPA for Ubuntu located at https://launchpad.net/%7Edjcj/+archive/ubuntu/screenfetch ### FreeBSD 1. Install screenfetch using the [ports](https://freshports.org/sysutils/screenfetch/) system: `cd /usr/ports/sysutils/screenfetch/ && make install clean` 2. Install screenfetch as a binary package: `pkg install screenFetch` -3. If screenfetch doesn't work as expected, try to (re-)install bash: `cd /usr/ports/shells/bash/ && make install clean` or `pkg install bash` +3. Make sure fdescfs(5) and procfs(5) are mounted, they're required by bash(1). -### Fedora (21 or later) +### Fedora -1. Install it with yum running: `yum install screenfetch` +1. Install it with dnf running: `dnf install screenfetch` ### KaOS @@ -133,3 +135,5 @@ script, become part of the project, or talk to me about anything else, you can either email me at `zeldarealm@gmail.com` or you can connect to Rizon and reach me at `irc://irc.rizon.net/screenFetch` + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenfetch-3.7.0+git.20161002/screenfetch-dev new/screenfetch-3.7.0+git.20170127/screenfetch-dev --- old/screenfetch-3.7.0+git.20161002/screenfetch-dev 2016-10-02 04:07:12.000000000 +0200 +++ new/screenfetch-3.7.0+git.20170127/screenfetch-dev 2017-01-27 12:54:38.000000000 +0100 @@ -28,9 +28,10 @@ # curl (screenshot uploading) -LANG=C -LANGUAGE=C -LC_ALL=C +#LANG=C +#LANGUAGE=C +#LC_ALL=C + scriptVersion="3.7.0" @@ -226,7 +227,7 @@ my_hcolor=$(colorNumberToCode "${my_hcolor}") } -supported_distros="Alpine Linux, Antergos, Arch Linux (Old and Current Logos), BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Gentoo, gNewSense, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, openSUSE, Oracle Linux, Parabola GNU/Linux-libre, PCLinuxOS, PeppermintOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Slackware, Solus, SparkyLinux, SteamOS, SUSE Linux Enterprise, TinyCore, Trisquel, Ubuntu, Viperr and Void." +supported_distros="Alpine Linux, Antergos, Arch Linux (Old and Current Logos), BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Fux, Gentoo, gNewSense, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, openSUSE, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Slackware, Solus, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr and Void." supported_other="Dragonfly/Free/Open/Net BSD, Haiku, Mac OS X, Windows+Cygwin and Windows+MSYS2." supported_dms="KDE, GNOME, Unity, Xfce, LXDE, Cinnamon, MATE, Deepin, CDE, RazorQt and Trinity." supported_wms="2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, chromeos-wm, Compiz, deepin-wm, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FLWM, FVWM, herbstluftwm, howm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, sway, TWin, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3." @@ -388,7 +389,7 @@ done fi case "${distro_detect}" in - "CentOS"|"Chapeau"|"Deepin"|"Devuan"|"Fedora"|"gNewSense"|"Jiyuu Linux"|"Kogaion"|"Korora"|"Mageia"|"Netrunner"|"NixOS"|"Raspbian"|"Sabayon"|"Solus"|"SteamOS"|"Trisquel"|"Ubuntu") + "CentOS"|"Chapeau"|"Deepin"|"Devuan"|"Fedora"|"gNewSense"|"Jiyuu Linux"|"Kogaion"|"Korora"|"Mageia"|"Netrunner"|"NixOS"|"Pardus"|"Raspbian"|"Sabayon"|"Solus"|"SteamOS"|"Trisquel"|"Ubuntu"|"GrombyangOS") # no need to fix $distro/$distro_codename/$distro_release distro="${distro_detect}" ;; @@ -403,6 +404,10 @@ distro="Logos" distro_release="n/a" fi + if grep -q -i 'swagarch' /etc/os-release; then + distro="SwagArch" + distro_release="n/a" + fi ;; "BLAG") distro="BLAG" @@ -426,6 +431,10 @@ if [[ "$(cat /etc/os-release)" =~ "Raspbian" ]]; then distro="Raspbian" distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) + fi + if [[ "$(cat /etc/os-release)" =~ "BlankOn" ]]; then + distro="BlankOn" + distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) else distro="Debian" fi @@ -451,6 +460,10 @@ distro="Fuduntu" distro_codename=null ;; + "Fux") + distro="Fux" + distro_codename=null + ;; "Gentoo") if [[ "$(lsb_release -sd)" =~ "Funtoo" ]]; then distro="Funtoo" @@ -534,6 +547,9 @@ distro_codename="n/a" distro_release="n/a" ;; + "Parrot"|"Parrot Security") + distro="Parrot Security" + ;; "PCLinuxOS") distro="PCLinuxOS" distro_codename="n/a" @@ -582,9 +598,14 @@ # Existing File Check if [ "$distro" == "Unknown" ]; then if [ $(uname -o 2>/dev/null) ]; then - case "$(uname -o)" in - "Cygwin") - distro="Cygwin" + os="$(uname -o)" + case "$os" in + "Cygwin"|"FreeBSD"|"OpenBSD"|"NetBSD") + distro="$os" + fake_distro="${distro}" + ;; + "DragonFly") + distro="DragonFlyBSD" fake_distro="${distro}" ;; "Msys") @@ -716,6 +737,7 @@ distro="Fedora" fi elif [ -f /etc/frugalware-release ]; then distro="Frugalware" + elif [ -f /etc/fux-release ]; then distro="Fux" elif [ -f /etc/gentoo-release ]; then if grep -q "Funtoo" /etc/gentoo-release ; then distro="Funtoo" @@ -750,6 +772,7 @@ fi fi if [[ "${distro_more}" =~ "Tumbleweed" ]]; then distro_more="Tumbleweed"; fi + elif [ -f /etc/pardus-release ]; then distro="Pardus" elif [ -f /etc/pclinuxos-release ]; then distro="PCLinuxOS" elif [ -f /etc/redstar-release ]; then distro="Red Star OS" @@ -891,6 +914,7 @@ frugalware) distro="Frugalware" ;; fuduntu) distro="Fuduntu" ;; funtoo) distro="Funtoo" ;; + fux) distro="Fux" ;; gentoo) distro="Gentoo" ;; gnewsense) distro="gNewSense" ;; haiku) distro="Haiku" ;; @@ -919,6 +943,8 @@ openbsd) distro="OpenBSD" ;; opensuse) distro="openSUSE" ;; parabolagnu|parabolagnu/linux-libre|'parabola gnu/linux-libre'|parabola) distro="Parabola GNU/Linux-libre" ;; + pardus) distro="Pardus" ;; + parrot|parrot*security) distro="Parrot Security" ;; pclinuxos|pclos) distro="PCLinuxOS" ;; peppermint) distro="Peppermint" ;; qubes) distro="Qubes OS" ;; @@ -930,10 +956,13 @@ sailfish|sailfish*os) distro="SailfishOS" ;; slackware) distro="Slackware" ;; solus) distro="Solus" ;; + sparky|sparky*linux) distro="SparkyLinux" ;; steam|steam*os) distro="SteamOS" ;; suse*linux*enterprise) distro="SUSE Linux Enterprise" ;; + swagarch) distro="SwagArch" ;; tinycore|tinycore*linux) distro="TinyCore" ;; trisquel) distro="Trisquel";; + grombyangos) distro="GrombyangOS" ;; ubuntu) distro="Ubuntu" if grep -q 'Microsoft' /proc/version 2>/dev/null || \ @@ -953,6 +982,7 @@ detecthost () { myUser=${USER} myHost=${HOSTNAME} + if [[ -z "$USER" ]]; then myUser=$(whoami); fi if [[ "${distro}" == "Mac OS X" ]]; then myHost=${myHost/.local}; fi verboseOut "Finding hostname and user...found as '${myUser}@${myHost}'" } @@ -962,12 +992,16 @@ # Kernel Version Detection - Begin detectkernel () { + if [[ "$distro" == "OpenBSD" ]]; then + kernel=$(sysctl kern.version|awk -F'[ =:]' 'NR==1{print $3" "$4" "$5}') + else # compatibility for older versions of OS X: kernel=$(uname -m && uname -sr) kernel=${kernel//$'\n'/ } #kernel=( $(uname -srm) ) #kernel="${kernel[${#kernel[@]}-1]} ${kernel[@]:0:${#kernel[@]}-1}" verboseOut "Finding kernel version...found as '${kernel}'" +fi } # Kernel Version Detection - End @@ -1018,14 +1052,14 @@ pkgs="Unknown" case "${distro}" in 'Alpine Linux') pkgs=$(apk info | wc -l) ;; - 'Arch Linux'|'Parabola GNU/Linux-libre'|'Chakra'|'Manjaro'|'Antergos'|'Netrunner'|'KaOS'|'Obarun') pkgs=$(pacman -Qq | wc -l) ;; + 'Arch Linux'|'Parabola GNU/Linux-libre'|'Chakra'|'Manjaro'|'Antergos'|'Netrunner'|'KaOS'|'Obarun'|'SwagArch') pkgs=$(pacman -Qq | wc -l) ;; 'Dragora') pkgs=$(ls -1 /var/db/pkg | wc -l) ;; 'Frugalware') pkgs=$(pacman-g2 -Q | wc -l) ;; - 'Fuduntu'|'Ubuntu'|'Mint'|'KDE neon'|'Debian'|'Devuan'|'Raspbian'|'LMDE'|'CrunchBang'|'Peppermint'|'LinuxDeepin'|'Deepin'|'Kali Linux'|'Trisquel'|'elementary OS'|'gNewSense'|'BunsenLabs'|'SteamOS') pkgs=$(dpkg -l | grep -c ^i) ;; + 'Debian'|'Ubuntu'|'Mint'|'Fuduntu'|'KDE neon'|'Devuan'|'Raspbian'|'LMDE'|'CrunchBang'|'Peppermint'|'LinuxDeepin'|'Deepin'|'Kali Linux'|'Trisquel'|'elementary OS'|'gNewSense'|'BunsenLabs'|'SteamOS'|'Parrot Security'|'GrombyangOS') pkgs=$(dpkg -l | grep -c ^i) ;; 'Slackware') pkgs=$(ls -1 /var/log/packages | wc -l) ;; 'Gentoo'|'Sabayon'|'Funtoo'|'Chrome OS'|'Kogaion') pkgs=$(ls -d /var/db/pkg/*/* | wc -l) ;; 'NixOS') pkgs=$(ls -d -1 /nix/store/*/ | wc -l) ;; - 'Fedora'|'Korora'|'BLAG'|'Chapeau'|'openSUSE'|'SUSE Linux Enterprise'|'Red Hat Enterprise Linux'|'ROSA'|'Oracle Linux'|'CentOS'|'Mandriva'|'Mandrake'|'Mageia'|'Mer'|'SailfishOS'|'PCLinuxOS'|'Viperr'|'Qubes OS'|'Red Star OS') pkgs=$(rpm -qa | wc -l) ;; + 'Fedora'|'Fux'|'Korora'|'BLAG'|'Chapeau'|'openSUSE'|'SUSE Linux Enterprise'|'Red Hat Enterprise Linux'|'ROSA'|'Oracle Linux'|'CentOS'|'Mandriva'|'Mandrake'|'Mageia'|'Mer'|'SailfishOS'|'PCLinuxOS'|'Viperr'|'Qubes OS'|'Red Star OS') pkgs=$(rpm -qa | wc -l) ;; 'Void') pkgs=$(xbps-query -l | wc -l) ;; 'Evolve OS'|'Solus') pkgs=$(pisi list-installed | wc -l) ;; 'CRUX') pkgs=$(pkginfo -i | wc -l) ;; @@ -1061,7 +1095,7 @@ pkg info | wc -l | awk '{print $1}'; else pkg_info | wc -l | tr -d ' '; fi) ;; 'OpenBSD') - pkgs=$(pkg_info | wc -l | awk '{sub(" ", "");print $1}') + pkgs=$(pkg_info | grep -c .) ;; 'FreeBSD') pkgs=$(if TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexistent pkg info pkg >/dev/null 2>&1; then @@ -1239,7 +1273,7 @@ # gpu=$(sed 's/.*device.*= //' <<< "${gpu_info}" | sed "s/'//g") fi elif [[ "${distro}" == "OpenBSD" ]]; then - gpu=$(glxinfo | grep 'OpenGL renderer string' | sed 's/OpenGL renderer string: //') + gpu=$(glxinfo 2> /dev/null | grep 'OpenGL renderer string' | sed 's/OpenGL renderer string: //') elif [[ "${distro}" == "Mac OS X" ]]; then gpu=$(system_profiler SPDisplaysDataType | awk -F': ' '/^\ *Chipset Model:/ {print $2}' | awk '{ printf "%s / ", $0 }' | sed -e 's/\/ $//g') elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then @@ -1251,7 +1285,7 @@ gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | awk -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g') elif [[ -n "$(PATH="/usr/sbin:$PATH" type -p glxinfo)" && -z "${gpu}" ]]; then gpu_info=$($(PATH="/usr/sbin:$PATH" type -p glxinfo | cut -f1) 2>/dev/null) - gpu=$(grep "OpenGL renderer string" <<< "${gpu_info}" | cut -d ':' -f2 | sed -n '1h;2,$H;${g;s/\n/,/g;p}') + gpu=$(grep "OpenGL renderer string" <<< "${gpu_info}" | cut -d ':' -f2 | sed -n '1h;2,$H;${g;s/\n/,/g;p}') gpu="${gpu:1}" gpu_info=$(grep "OpenGL vendor string" <<< "${gpu_info}") elif [[ -n "$(PATH="/usr/sbin:$PATH" type -p lspci)" && -z "$gpu" ]]; then @@ -1307,24 +1341,21 @@ # Memory Detection - Begin detectmem () { - hw_mem=0 - free_mem=0 - human=1024 if [ "$distro" == "Mac OS X" ]; then - totalmem=$(echo "$(sysctl -n hw.memsize)"/${human}^2|bc) + totalmem=$(echo "$(sysctl -n hw.memsize)" / 1024^2 | bc) wiredmem=$(vm_stat | grep wired | awk '{ print $4 }' | sed 's/\.//') activemem=$(vm_stat | grep ' active' | awk '{ print $3 }' | sed 's/\.//') compressedmem=$(vm_stat | grep occupied | awk '{ print $5 }' | sed 's/\.//') if [[ ! -z "$compressedmem | tr -d" ]]; then compressedmem=0 fi - usedmem=$(((${wiredmem} + ${activemem} + ${compressedmem}) * 4 / $human)) + usedmem=$(((${wiredmem} + ${activemem} + ${compressedmem}) * 4 / 1024)) elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) - totalmem=$((${total_mem}/$human)) + totalmem=$((${total_mem} / 1024)) free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) used_mem=$((${total_mem} - ${free_mem})) - usedmem=$((${used_mem} / $human)) + usedmem=$((${used_mem} / 1024)) elif [[ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]]; then phys_mem=$(sysctl -n hw.physmem) size_mem=$phys_mem @@ -1335,7 +1366,7 @@ size_chip=`echo "$size_chip * 2" | bc` done round_mem=`echo "( $size_mem / $size_chip + 1 ) * $size_chip " | bc` - totalmem=$(($round_mem / ($human * $human) )) + totalmem=$(($round_mem / 1024^2 )) pagesize=$(sysctl -n hw.pagesize) inactive_count=$(sysctl -n vm.stats.vm.v_inactive_count) inactive_mem=$(($inactive_count * $pagesize)) @@ -1345,47 +1376,38 @@ free_mem=$(($free_count * $pagesize)) avail_mem=$(($inactive_mem + $cache_mem + $free_mem)) used_mem=$(($round_mem - $avail_mem)) - usedmem=$(($used_mem / ($human * $human) )) + usedmem=$(($used_mem / 1024^2 )) elif [ "$distro" == "OpenBSD" ]; then - totalmem=$(($(sysctl -n hw.physmem) / $human / $human)) - usedmem=$(($(vmstat | sed -n 3p | cut -d' ' -f5) / $human)) + totalmem=$(($(sysctl -n hw.physmem) / 1024 / 1024)) + usedmem=$(($(vmstat | awk '!/[a-z]/{print $4}') / 1024)) elif [ "$distro" == "NetBSD" ]; then phys_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) - totalmem=$((${phys_mem} / $human)) + totalmem=$((${phys_mem} / 1024)) if grep -q 'Cached' /proc/meminfo; then cache=$(awk '/Cached/ {print $2}' /proc/meminfo) - usedmem=$((${cache} / $human)) + usedmem=$((${cache} / 1024)) else free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) used_mem=$((${phys_mem} - ${free_mem})) - usedmem=$((${used_mem} / $human)) + usedmem=$((${used_mem} / 1024)) fi elif [ "$distro" == "Haiku" ]; then - totalmem=$(( $(sysinfo -mem | head -n1 | cut -d'/' -f3 | tr -d ' ' | tr -d ')') / $human / $human )) - usedmem=$(( $(sysinfo -mem | head -n1 | cut -d'/' -f2 | sed 's/max//; s/ //g') / $human / $human )) + totalmem=$(( $(sysinfo -mem | head -n1 | cut -d'/' -f3 | tr -d ' ' | tr -d ')') / 1024^2 )) + usedmem=$(( $(sysinfo -mem | head -n1 | cut -d'/' -f2 | sed 's/max//; s/ //g') / 1024^2 )) else + # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable + # Source: https://github.com/dylanaraps/neofetch/pull/391/files#diff-e863270127ca6116f... mem_info=$(/dev/null 2>&1; then - gtk2Theme=$(xfconf-query -c xsettings -p /Net/ThemeName) - fi + if [ "$distro" == "BunsenLabs" ] ; then + gtk2Theme=$(awk -F'"' '/^gtk-theme/ {print $2}' $HOME/.gtkrc-2.0) + gtk3Theme=$(awk -F'=' '/^gtk-theme-name/ {print $2}' $HOME/.config/gtk-3.0/settings.ini) + gtkIcons=$(awk -F'"' '/^gtk-icon-theme/ {print $2}' $HOME/.gtkrc-2.0) + gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' $HOME/.gtkrc-2.0) + else + if type -p xfconf-query >/dev/null 2>&1; then + gtk2Theme=$(xfconf-query -c xsettings -p /Net/ThemeName) + fi - if type -p xfconf-query >/dev/null 2>&1; then - gtkIcons=$(xfconf-query -c xsettings -p /Net/IconThemeName) - fi + if type -p xfconf-query >/dev/null 2>&1; then + gtkIcons=$(xfconf-query -c xsettings -p /Net/IconThemeName) + fi - if type -p xfconf-query >/dev/null 2>&1; then - gtkFont=$(xfconf-query -c xsettings -p /Gtk/FontName) + if type -p xfconf-query >/dev/null 2>&1; then + gtkFont=$(xfconf-query -c xsettings -p /Gtk/FontName) + fi fi ;; 'LXDE'*) @@ -3015,6 +3052,31 @@ "${c2} %s") ;; + "Fux") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'white') # White + c2=$(getColor 'light blue') # Light Blue + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi + startline="0" + fulloutput=("$c2 %s" +"$c2 %s" +"$c2 %s" +"$c2 %s" +"$c2 %s" +"$c2 ______ Sürüm 1.0 %s" +"$c2 | ____| __ __ __ __TM %s" +"$c2 | |___ | | | |\ \/ / %s" +"$c2 | ____|| | | | \ / %s" +"$c2 | | | |_| | / \ %s" +"$c2 |_| |_____|/ /\_\ %s" +"$c2 /_/ %s" +"$c2 %s" +"$c2 %s" +"$c2 %s" +" %s") + ;; + "Chapeau") if [[ "$no_color" != "1" ]]; then c1=$(getColor 'white') # White @@ -3493,6 +3555,37 @@ "${c2} NZZZZZZZZZZZ${c1}MMMMM %s" "${c2} ZZZZZZZZZ${c1}MM %s") ;; + +"Grombyang"|"GrombyangOS") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'light blue') + c2=$(getColor 'light green') + c3=$(getColor 'light red') + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi + startline="0" + fulloutput=( +"${c1} eeeeeeeeeeee %s" +"${c1} eeeeeeeeeeeeeeeee %s" +"${c1} eeeeeeeeeeeeeeeeeeeeeee %s" +"${c1} eeeee "${c2}".o+ "${c1}"eeee %s" +"${c1} eeee "${c2}"\`ooo/ "${c1}"eeee %s" +"${c1} eeee "${c2}"\`+oooo: "${c1}"eeee %s" +"${c1} eee "${c2}"\`+oooooo: "${c1}"eee %s" +"${c1} eee "${c2}"-+oooooo+: "${c1}"eee %s" +"${c1} ee "${c2}"\`/:oooooooo+: "${c1}"ee %s" +"${c1} ee "${c2}"\`/+ +++ +: "${c1}"ee %s" +"${c1} ee "${c2}"+o+\ "${c1}"ee %s" +"${c1} eee "${c2}"+o+\ "${c1}"eee %s" +"${c1} eee "${c2}"// \\ooo/ \\\ "${c1}"eee %s" +"${c1} eee "${c2}"//++++oooo++++\\\ "${c1}"eee %s" +"${c1} eeee "${c2}"::::++oooo+::::: "${c1}"eeee %s" +"${c1} eeeee "${c3}"Grombyang OS "${c1}" eeee %s" +"${c1} eeeeeeeeeeeeeeeeeeeeeee %s" +"${c1} eeeeeeeeeeeeeeeee %s" +" %s" +" %s") + ;; "Solus") if [[ "$no_color" != "1" ]]; then @@ -3941,10 +4034,7 @@ "${c1} ████████ ████████ ████████ %s" "${c1} ████████ ████████ ████████ %s" "${c1} ████████ ████████ ████████ %s" -"${c1} ████████ ████████ ████████ %s" -"${c1} ████████ ████████ ████████ %s" -"${c1} ████████ ████████ ████████ %s" -"${c1} %s") +" %s") ;; "Netrunner") @@ -4601,6 +4691,129 @@ "${c1} %s") ;; + "SparkyLinux") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'light gray') # Gray + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi + startline="0" + logowidth="48" + fulloutput=( +"${c1} . \`-:-\` %s" +"${c1} .o\` .-///-\` %s" +"${c1} \`oo\` .:/++:. %s" +"${c1} os+\` -/+++:\` \`\`.........\`\`\` %s" +"${c1} /ys+\`./+++/-.-::::::----......\`\` %s" +"${c1} \`syyo\`++o+--::::-::/+++/-\`\` %s" +"${c1} -yyy+.+o+\`:/:-:sdmmmmmmmmdy+-\` %s" +"${c1} ::-\` :yyy/-oo.-+/\`ymho++++++oyhdmdy/\` %s" +"${c1} \`/yy+-\`.syyo\`+o..o--h..osyhhddhs+//osyy/\` %s" +"${c1} -ydhs+-oyy/.+o.-: \` \` :/::+ydhy+\`\`\`-os- %s" +"${c1} .sdddy::syo--/:. \`.:dy+-ohhho ./: %s" +"${c1} :yddds/:+oo+//:-\`- /+ +hy+.shhy: \`\` %s" +"${c1} \`:ydmmdysooooooo-.ss\`/yss--oyyo %s" +"${c1} \`./ossyyyyo+:-/oo:.osso- .oys %s" +"${c1} \`\`..-------::////.-oooo/ :so %s" +"${c1} \`...----::::::::--.\`/oooo: .o: %s" +"${c1} \`\`\`\`\`\`\` ++o+:\` \`:\` %s" +"${c1} ./+/-\` \` %s" +"${c1} \`-:-. %s" +"${c1} \`\` %s") + ;; + + "Pardus") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'yellow') # Light Yellow + c2=$(getColor 'dark grey') # Light Gray + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi + startline="1" + logowidth="45" + fulloutput=( +"" +"${c1} .smNdy+- \`.:/osyyso+:.\` -+ydmNs. %s" +"${c1} /Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ %s" +"${c1} mN. oMdyy- -y \`-dMo .Nm %s" +"${c1} .mN+\` sMy hN+ -: yMs \`+Nm. %s" +"${c1} \`yMMddMs.dy \`+\` sMddMMy\` %s" +"${c1} +MMMo .\` . oMMM+ %s" +"${c1} \`NM/ \`\`\`\`\`.\` \`.\`\`\`\`\` +MN\` %s" +"${c1} yM+ \`.-:yhomy ymohy:-.\` +My %s" +"${c1} yM: yo oy :My %s" +"${c1} +Ms .N\` \`N. +h sM+ %s" +"${c1} \`MN - -::::::- : :o:+\`NM\` %s" +"${c1} yM/ sh -dMMMMd- ho +y+My %s" +"${c1} .dNhsohMh-//: /mm/ ://-yMyoshNd\` %s" +"${c1} \`-ommNMm+:/. oo ./:+mMNmmo:\` %s" +"${c1} \`/o+.-somNh- :yy: -hNmos-.+o/\` %s" +"${c1} ./\` .s/\`s+sMdd+\`\`+ddMs+s\`/s. \`/. %s" +"${c1} : -y. -hNmddmNy. .y- : %s" +"${c1} -+ \`..\` +- %s" +"%s") + ;; + + "SwagArch") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'white') # White + c2=$(getColor 'light blue') # Light Blue + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi + startline="0" + logowidth="48" + fulloutput=( +"${c1} %s" +"${c1} .;ldkOKXXNNNNXXK0Oxoc,. %s" +"${c1} ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; %s" +"${c1} 'K0xo ..,;:c:. \`'lKMMMMM0 %s" +"${c1} .lONMMMMMM' \`lNMk' %s" +"${c1} ;WMMMMMMMMMO. ${c2}....::... %s" +"${c1} OMMMMMMMMMMMMKl. ${c2}.,;;;;;ccccccc, %s" +"${c1} \`0MMMMMMMMMMMMMM0: ${c2}.. .ccccccc. %s" +"${c1} 'kWMMMMMMMMMMMMMNo. ${c2}.,:' .ccccccc. %s" +"${c1} \`c0MMMMMMMMMMMMMN,${c2},:c; :cccccc: %s" +"${c1} ckl. \`lXMMMMMMMMMX${c2}occcc:.. ;ccccccc. %s" +"${c1} dMMMMXd, \`OMMMMMMWk${c2}ccc;:''\` ,ccccccc: %s" +"${c1} XMMMMMMMWKkxxOWMMMMMNo${c2}ccc; .cccccccc. %s" +"${c1} \`':ldxO0KXXXXXK0Okdo${c2}cccc. :cccccccc. %s" +"${c2} :ccc:' \`cccccccc:, %s" +"${c2} '' %s" +"${c2} %s") + ;; + + "Parrot Security") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'light blue') # Light Blue + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi + startline="0" + logowidth="43" + fulloutput=( +"${c1} ,:oho/-. %s" +"${c1} mMMMMMMMMMMMNmmdhy- %s" +"${c1} dMMMMMMMMMMMMMMMMMMs. %s" +"${c1} +MMsohNMMMMMMMMMMMMMm/ %s" +"${c1} .My .+dMMMMMMMMMMMMMh. %s" +"${c1} + :NMMMMMMMMMMMMNo %s" +"${c1} \`yMMMMMMMMMMMMMm: %s" +"${c1} /NMMMMMMMMMMMMMy. %s" +"${c1} .hMMMMMMMMMMMMMN+ %s" +"${c1} \`\`-NMMMMMMMMMd- %s" +"${c1} /MMMMMMMMMMMs. %s" +"${c1} mMMMMMMMsyNMN/ %s" +"${c1} +MMMMMMMo :sNh. %s" +"${c1} \`NMMMMMMm -o/ %s" +"${c1} oMMMMMMM. %s" +"${c1} \`NMMMMMM+ %s" +"${c1} +MMd/NMh %s" +"${c1} mMm -mN\` %s" +"${c1} /MM \`h: %s" +"${c1} dM\` . %s" +"${c1} :M- %s" +"${c1} d: %s" +"${c1} -+ %s" +"${c1} - %s") + ;; + *) if [ "$(echo "${kernel}" | grep 'Linux' )" ]; then if [[ "$no_color" != "1" ]]; then @@ -4823,10 +5036,10 @@ myascii="${distro}" [[ "${asc_distro}" ]] && myascii="${asc_distro}" case ${myascii} in - "Alpine Linux"|"Arch Linux - Old"|"Fedora"|"Korora"|"Chapeau"|"Mandriva"|"Mandrake"|"Chakra"|"ChromeOS"|"Sabayon"|"Slackware"|"Mac OS X"|"Trisquel"|"Kali Linux"|"Jiyuu Linux"|"Antergos"|"KaOS"|"Logos"|"gNewSense"|"Netrunner"|"NixOS"|"SailfishOS"|"Qubes OS"|"Kogaion"|"PCLinuxOS"|"Obarun"|"Solus") labelcolor=$(getColor 'light blue');; + "Alpine Linux"|"Arch Linux - Old"|"Fedora"|"Korora"|"Chapeau"|"Mandriva"|"Mandrake"|"Chakra"|"ChromeOS"|"Sabayon"|"Slackware"|"Mac OS X"|"Trisquel"|"Kali Linux"|"Jiyuu Linux"|"Antergos"|"KaOS"|"Logos"|"gNewSense"|"Netrunner"|"NixOS"|"SailfishOS"|"Qubes OS"|"Kogaion"|"PCLinuxOS"|"Obarun"|"Solus"|"SwagArch"|"Parrot Security") labelcolor=$(getColor 'light blue');; "Arch Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX") labelcolor=$(getColor 'light cyan');; "Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void") labelcolor=$(getColor 'light green');; - "Ubuntu"|"FreeBSD"|"FreeBSD - Old"|"Debian"|"Raspbian"|"BSD"|"Red Hat Enterprise Linux"|"Oracle Linux"|"Peppermint"|"Cygwin"|"Msys"|"Fuduntu"|"Scientific Linux"|"DragonFlyBSD"|"BackTrack Linux"|"Red Star OS") labelcolor=$(getColor 'light red');; + "Ubuntu"|"FreeBSD"|"FreeBSD - Old"|"Debian"|"Raspbian"|"BSD"|"Red Hat Enterprise Linux"|"Oracle Linux"|"Peppermint"|"Cygwin"|"Msys"|"Fuduntu"|"Scientific Linux"|"DragonFlyBSD"|"BackTrack Linux"|"Red Star OS"|"SparkyLinux") labelcolor=$(getColor 'light red');; "ROSA") labelcolor=$(getColor 'white');; "CrunchBang"|"Viperr"|"elementary"*) labelcolor=$(getColor 'dark grey');; "Gentoo"|"Parabola GNU/Linux-libre"|"Funtoo"|"Funtoo-text"|"BLAG"|"SteamOS"|"Devuan") labelcolor=$(getColor 'light purple');; @@ -5086,11 +5299,10 @@ ! [[ $Win_theme ]] && detectwmtheme; else if [[ "${display[*]}" =~ "$i" ]]; then - if [[ "$errorSuppress" == "1" ]]; then detect${i} 2>/dev/null + if [[ "$errorSuppress" == "1" ]]; then + detect${i} 2>/dev/null else - exec 3> >(stderrOut) - detect${i} 2>&3 - exec 3>&- + detect${i} fi fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenfetch-3.7.0+git.20161002/screenfetch.1 new/screenfetch-3.7.0+git.20170127/screenfetch.1 --- old/screenfetch-3.7.0+git.20161002/screenfetch.1 2016-10-02 04:07:12.000000000 +0200 +++ new/screenfetch-3.7.0+git.20170127/screenfetch.1 2017-01-27 12:54:38.000000000 +0100 @@ -1,4 +1,4 @@ -.TH SCREENFETCH "1" "September 2016" "3.7.0" "User Commands" +.TH SCREENFETCH "1" "December 2016" "3.7.0" "User Commands" .\" Don't remove the lines starting with ».\" @supported_« ! .\" They're important for update-manpage.sh. @@ -21,7 +21,7 @@ Supported GNU/Linux Distributions: .IP .\" @supported_distros_start@ -Alpine Linux, Antergos, Arch Linux (Old and Current Logos), BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Gentoo, gNewSense, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, openSUSE, Oracle Linux, Parabola GNU/Linux-libre, PCLinuxOS, PeppermintOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Slackware, Solus, SparkyLinux, SteamOS, SUSE Linux Enterprise, TinyCore, Trisquel, Ubuntu, Viperr and Void. +Alpine Linux, Antergos, Arch Linux (Old and Current Logos), BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Fux, Gentoo, gNewSense, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, openSUSE, Oracle Linux, Parabola GNU/Linux-libre, Pardus, PCLinuxOS, PeppermintOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Slackware, Solus, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr and Void. .\" @supported_distros_end@ .PP Other Supported Systems: