From 4932d2be2f9545495e378e53d3868c86d4d927c7 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Sat, 11 Jun 2011 01:34:19 +0000 Subject: [PATCH] patch update, cleaned up output for --recommends, changed - to _, then sed replace _ with space --- inxi | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/inxi b/inxi index aac59ee..b9e3713 100755 --- a/inxi +++ b/inxi @@ -3,7 +3,7 @@ #### Script Name: inxi #### version: 1.6.6 #### Date: June 10 2011 -#### Patch Number: 01 +#### Patch Number: 02 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -1470,41 +1470,41 @@ check_recommends_items() # for uninstalled: repoquery -qf /usr/bin/package # pardus: pisi sf -q /usr/bin/package local required_apps=' - df:coreutils~coreutils~?~:partition-data - free:procps~procps~?~:system-memory - gawk:gawk~gawk~gawk~:core-tool - grep:grep~grep~grep~:string-search + df:coreutils~coreutils~?~:partition_data + free:procps~procps~?~:system_memory + gawk:gawk~gawk~gawk~:core_tool + grep:grep~grep~grep~:string_search hostname:hostname~coreutils~?~: - lspci:pciutils~pciutils~?~:hardware-data - ps:procps~procps~?~:process-data + lspci:pciutils~pciutils~?~:hardware_data + ps:procps~procps~?~:process_data readlink:coreutils~coreutils~?~: - sed:sed~sed~sed~:string-replace - tr:coreutils~coreutils~?~:character-replace - uname:uname~coreutils~?~:kernel-data + sed:sed~sed~sed~:string_replace + tr:coreutils~coreutils~?~:character_replace + uname:uname~coreutils~?~:kernel_data uptime:procps~procps~?~: - wc:coreutils~coreutils~?~:word-character-count + wc:coreutils~coreutils~?~:word_character_count ' local x_recommends=' - glxinfo:mesa-utils~mesa-demos~?~:-G_glx-info - xdpyinfo:X11-utils~xorg-xdpyinfo~?~:-G_multi-screen-resolution - xprop:X11-utils~xprop~?~:-S_desktop-data - xrandr:x11-xserver-utils~xrandr~?~:-G_single-screen-resolution + glxinfo:mesa-utils~mesa-demos~?~:-G_glx_info + xdpyinfo:X11-utils~xorg-xdpyinfo~?~:-G_multi_screen_resolution + xprop:X11-utils~xprop~?~:-S_desktop_data + xrandr:x11-xserver-utils~xrandr~?~:-G_single_screen_resolution ' local recommended_apps=' - file:file~file~file~:-o_file-system - hddtemp:hddtemp~hddtemp~hddtemp~:-Dx_show-hdd-temp - ifconfig:net-tools~net-tools~?~:-i_ip-lan - sensors:lm-sensors~lm_sensors~?~:-s_sensors-output - lsusb:usbutils~usbutils~?~:-A_usb-audio;-N_usb-networking - modinfo:module-init-tools~module-init-tools~?~:-Ax_module-version + file:file~file~file~:-o_unmounted_file_system + hddtemp:hddtemp~hddtemp~hddtemp~:-Dx_show_hdd_temp + ifconfig:net-tools~net-tools~?~:-i_ip_lan + sensors:lm-sensors~lm_sensors~?~:-s_sensors_output + lsusb:usbutils~usbutils~?~:-A_usb-audio;-N_usb_networking + modinfo:module-init-tools~module-init-tools~?~:-Ax_module_version runlevel:sysvinit~sysvinit~?~:-I_runlevel - sudo:sudo~sudo~sudo~:-Dx_user-hddtemp;-o_user-filesystem + sudo:sudo~sudo~sudo~:-Dx_hddtemp-user;-o_file-user ' local recommended_dirs=' - /sys/class/dmi/id/:-M_motherboard-bios - /dev:-l,-u,-o,-p,-P,-D_disk-partition-data - /dev/disk/by-label/:-l,-o,-p,-P_partition-labels - /dev/disk/by-uuid/:-u,-o,-p,-P_partition-uuid + /sys/class/dmi/id/:-M_system,_motherboard,_bios + /dev:-l,-u,-o,-p,-P,-D_disk_partition_data + /dev/disk/by-label/:-l,-o,-p,-P_partition_labels + /dev/disk/by-uuid/:-u,-o,-p,-P_partition_uuid ' case $1 in @@ -1567,7 +1567,7 @@ check_recommends_items() fi fi if [[ -n $feature ]];then - print_string="$item_string: $application (info: $feature)" + print_string="$item_string: $application (info: $( sed 's/_/ /g' <<< $feature ))" else print_string="$item_string: $application" fi