From 609b3f5e6ded8a9137e4832b0523574a6a4c4b8c Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: Jun 24 2014 05:19:33 +0000 Subject: Fix #1055100 and #1112431 * Update avc command to use journalctl * Add mate session to list of desktop sessions --- diff --git a/CHANGELOG b/CHANGELOG index 4500be0..0fed2ee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ fpaste ChangeLog +0.3.7.3.1 - 20140624 + + *) Add mate session to --sysinfo + *) Update avc command to use journalctl + 0.3.7.3 - 20140610 *) Improve how fpaste fails when xsel is absent for --clipout - rhbz #1107333 diff --git a/docs/man/en/fpaste.1 b/docs/man/en/fpaste.1 index da09a76..94be0e1 100644 --- a/docs/man/en/fpaste.1 +++ b/docs/man/en/fpaste.1 @@ -1,5 +1,5 @@ .\" first draft by Ankur Sinha <ankursinha at fedoraproject.org> -.TH "fpaste" "1" "version 0.3.7.3" "Fedora Unity" "" +.TH "fpaste" "1" "version 0.3.7.3.1" "Fedora Unity" "" .SH "NAME" fpaste \- A cli frontend for the fpaste.org pastebin .SH "SYNOPSIS" diff --git a/fpaste b/fpaste index 824e165..730b07a 100755 --- a/fpaste +++ b/fpaste @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION = '0.3.7.3' +VERSION = '0.3.7.3.1' USER_AGENT = 'fpaste/' + VERSION SET_DESCRIPTION_IF_EMPTY = 1 # stdin, clipboard, sysinfo #FPASTE_URL = 'http://fpaste.org/' @@ -195,10 +195,10 @@ def sysinfo(show_stderr = False, show_successful_cmds = True, show_failed_cmds = cmdlist = [ ('OS Release', '''lsb_release -ds''', '''cat /etc/*-release | uniq''', 'cat /etc/issue', 'cat /etc/motd'), ('Kernel', '''uname -r ; cat /proc/cmdline'''), - ('Desktop(s) Running', '''ps -eo comm= | egrep '(gnome-session|startkde|startactive|xfce.?-session|fluxbox|blackbox|hackedbox|ratpoison|enlightenment|icewm-session|od-session|wmaker|wmx|openbox-lxde|openbox-gnome-session|openbox-kde-session|mwm|e16|fvwm|xmonad|sugar-session)' '''), + ('Desktop(s) Running', '''ps -eo comm= | egrep '(gnome-session|startkde|startactive|xfce.?-session|fluxbox|blackbox|hackedbox|ratpoison|enlightenment|icewm-session|od-session|wmaker|wmx|openbox-lxde|openbox-gnome-session|openbox-kde-session|mwm|e16|fvwm|xmonad|sugar-session|mate-session)' '''), ('Desktop(s) Installed', '''ls -m /usr/share/xsessions/ | sed 's/\.desktop//g' '''), ('SELinux Status', '''sestatus''', '''/usr/sbin/sestatus''', '''getenforce''', '''grep -v '^#' /etc/sysconfig/selinux'''), - ('SELinux Error Count', '''selinuxenabled && (grep avc: /var/log/messages; ausearch -m avc -ts today)2>/dev/null|egrep -o "comm=\\"[^ ]+"|sort|uniq -c|sort -rn'''), + ('SELinux Error Count', '''selinuxenabled && journalctl --since yesterday |grep avc: |egrep -o "comm=\"[^ ]+" |sort |uniq -c |sort -rn'''), ('CPU Model', '''grep 'model name' /proc/cpuinfo | awk -F: '{print $2}' | uniq -c | sed -re 's/^ +//' ''', '''grep 'model name' /proc/cpuinfo'''), ('64-bit Support', '''grep -q ' lm ' /proc/cpuinfo && echo Yes || echo No'''), ('Hardware Virtualization Support', '''egrep -q '(vmx|svm)' /proc/cpuinfo && echo Yes || echo No'''),