Attachment 917288 Details for Bug 1118711 – Use grep -E instead of deprecated egrep

[patch] Use grep -E instead of deprecated egrep

0001-Use-grep-E-instead-of-deprecated-egrep.patch (text/plain), 3.13 KB, created by Ville Skyttä on 2014-07-11 10:07:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-07-11 10:07:48 UTC

Size: 3.13 KB

patch

obsolete

>From 617624914499b1f593469da84ff41f6399ffc6dd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Fri, 11 Jul 2014 13:06:04 +0300
>Subject: [PATCH] Use grep -E instead of deprecated egrep
>
>---
> fpaste | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/fpaste b/fpaste
>index 730b07a..ddddba1 100755
>--- a/fpaste
>+++ b/fpaste
>@@ -195,13 +195,13 @@ 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|mate-session)' '''),
>+        ('Desktop(s) Running', '''ps -eo comm= | grep -E '(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 && journalctl --since yesterday |grep avc: |egrep -o "comm=\"[^ ]+" |sort |uniq -c |sort -rn'''),
>+        ('SELinux Error Count', '''selinuxenabled && journalctl --since yesterday |grep avc: |grep -Eo "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'''),
>+        ('Hardware Virtualization Support', '''grep -Eq '(vmx|svm)' /proc/cpuinfo && echo Yes || echo No'''),
>         ('Load average',       '''uptime'''),
>         ('Memory usage',       '''free -m''', 'free'),
>         #('Top',                '''top -n1 -b | head -15'''),
>@@ -213,7 +213,7 @@ def sysinfo(show_stderr = False, show_successful_cmds = True, show_failed_cmds =
>         ('USB devices',        '''lsusb''', '''/sbin/lsusb'''),
>         ('DRM Information',    '''grep drm /var/log/dmesg'''),
>         ('Xorg modules',       '''grep LoadModule /var/log/Xorg.0.log | cut -d \\" -f 2 | xargs'''),
>-        ('GL Support',         '''glxinfo | egrep "OpenGL version|OpenGL renderer"'''),
>+        ('GL Support',         '''glxinfo | grep -E "OpenGL version|OpenGL renderer"'''),
>         ('Xorg errors',        '''grep '^\[.*(EE)' /var/log/Xorg.0.log'''),
>         ('Kernel buffer tail', '''dmesg | tail'''),
>         ('Last few reboots',   '''last -x -n10 reboot runlevel'''),
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1118711: 917288