diff --git a/inxi b/inxi index 2b658e5..0bae203 100755 --- a/inxi +++ b/inxi @@ -425,7 +425,7 @@ SED_RX='-r' # for gnu sed, will be set to -E for bsd sed for backward compatibil # default to false, no konversation found, 1 is native konvi (qt3/KDE3) script mode, 2 is /cmd inxi start, ## 3 is Konversation > 1.2 (qt4/KDE4) KONVI=0 -# NO_CPU_COUNT=0 # Wether or not the string "dual" or similar is found in cpuinfo output. If so, avoid dups. +# NO_CPU_COUNT=0 # Whether or not the string "dual" or similar is found in cpuinfo output. If so, avoid dups. # This is a variable that controls how many parameters inxi will parse in a /proc//cmdline file before stopping. PARAMETER_LIMIT=30 SCHEME=0 # set default scheme - do not change this, it's set dynamically @@ -1494,10 +1494,10 @@ script_debugger() { eval $LOGFS if [[ $B_SCRIPT_UP == 'true' ]];then - # only return if debugger is off and no pre start up errors have occured + # only return if debugger is off and no pre start up errors have occurred if [[ $DEBUG -eq 0 && $DEBUG_BUFFER_INDEX -eq 0 ]];then return 0 - # print out the stored debugging information if errors occured + # print out the stored debugging information if errors occurred elif [[ $DEBUG_BUFFER_INDEX -gt 0 ]];then for (( DEBUG_BUFFER_INDEX=0; DEBUG_BUFFER_INDEX < ${#A_DEBUG_BUFFER[@]}; DEBUG_BUFFER_INDEX++ )) do @@ -1972,7 +1972,7 @@ debug_data_collector() if [[ -f xiin && ! -f $xiin_file ]];then mv -f xiin $xiin_file fi - # -Nc is creating really weird download anomolies, so using -O instead + # -Nc is creating really weird download anomalies, so using -O instead case $DOWNLOADER in curl) xiin_download="$( curl -s $xiin_url )" || downloader_error=$? @@ -3137,7 +3137,7 @@ show_options() print_lines_basic "2" "-N -A" "Version/port(s)/driver version (if available) for Network/Audio;" print_lines_basic "2" "-N -A -G" "Network, audio, graphics, shows PCI Bus ID/Usb ID number of card." print_lines_basic "2" "-R" "md-raid: Shows component raid id. Adds second RAID Info line: raid level; report on drives (like 5/5); blocks; chunk size; bitmap (if present). Resync line, shows blocks synced/total blocks. zfs-raid: Shows raid array full size; available size; portion allocated to RAID" - print_lines_basic "2" "-S" "Desktop toolkit if avaliable (GNOME/XFCE/KDE only); Kernel gcc version" + print_lines_basic "2" "-S" "Desktop toolkit if available (GNOME/XFCE/KDE only); Kernel gcc version" print_lines_basic "2" "-t" "Memory use output to cpu (-xt c), and cpu use to memory (-xt m)." if [[ $B_ALLOW_WEATHER == 'true' ]];then print_lines_basic "2" "-w -W" "Wind speed and time zone (-w only)." @@ -5225,7 +5225,7 @@ get_desktop_environment() fi fi # a few manual hacks for things that don't id with xprop, these are just good guesses - # note that gawk is going to exit after first occurance of search string, so no need for extra + # note that gawk is going to exit after first occurrence of search string, so no need for extra if [[ -z $desktop_environment ]];then if [[ -n $( grep -is 'fvwm-crystal' <<< "$Ps_aux_Data" ) ]];then version=$( get_program_version 'fvwm' '^fvwm' '2' ) @@ -5729,7 +5729,7 @@ get_distro_data() if [[ $distro_file == 'SuSE-release' ]];then # leaving off extra data since all new suse have it, in os-release, this file has line breaks, like os-release # but in case we want it, it's: CODENAME = Mantis | VERSION = 12.2 - # for now, just take first occurance, which should be the first line, which does not use a variable type format + # for now, just take first occurrence, which should be the first line, which does not use a variable type format distro=$( grep -i -m 1 'suse' /etc/$distro_file ) else distro=$( remove_erroneous_chars "/etc/$distro_file" ) @@ -12638,7 +12638,7 @@ print_dmidecode_error() elif [[ $2 == 'dmidecode-error-no-battery-data' ]];then error_message="${sysDmiError}dmidecode: no battery data available." elif [[ $2 == 'dmidecode-error-unknown-error' ]];then - error_message="${sysDmiError}dmidecode: unknown error occured" + error_message="${sysDmiError}dmidecode: unknown error occurred" fi echo $error_message eval $LOGFE @@ -13535,7 +13535,7 @@ print_network_advanced_data() if [[ -n ${a_network_working[6]} ]];then oper_state=${a_network_working[6]} fi - # no print out for wifi since it doesn't have duplex/speed data availabe + # no print out for wifi since it doesn't have duplex/speed data available # note that some cards show 'unknown' for state, so only testing explicitly # for 'down' string in that to skip showing speed/duplex if [[ $b_is_wifi != 'true' && $oper_state != 'down' ]];then diff --git a/inxi.changelog b/inxi.changelog index c638198..07ed26a 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -362,7 +362,7 @@ Script Date: 2016-03-30 Changes: ----------------------------------- New version, new tarball. Tiny fix in distro detection, will now default in sequence -on /etc/issue step to first test for os release and not mint, then lsb verison and +on /etc/issue step to first test for os release and not mint, then lsb version and not mint, then /etc/issue. This should keep the mint detection working well, as long as they keep mint string in the /etc/issue file, that is, but that's out of our control. @@ -491,7 +491,7 @@ Script Date: 2015-11-15 ----------------------------------- Changes: ----------------------------------- -New version, new tarball. Try 2 at mmcblk support. I had mmcblock, thats not how it's +New version, new tarball. Try 2 at mmcblk support. I had mmcblock, that's not how it's reported to the system. ----------------------------------- @@ -690,7 +690,7 @@ was by far the best option I've come across, it was done by a deep pocketed corp for pretty good reasons, and was never intended to be a profit center, which is the closest I could see for a non free option. -Setting up svn gui stuff however is a royal pain and requires ongoing maintainance for the life of +Setting up svn gui stuff however is a royal pain and requires ongoing maintenance for the life of the software, which is NOT fun, nor will I sign up for that obligation. I may end up moving to github anyway, even though git truly sucks for inxi and myself, but it's an @@ -2045,7 +2045,7 @@ Changes: ----------------------------------- new version: this is only an optimization release, testing some slightly more efficient methods: -something <<< $variable is signficantly slower than: echo $variable | something +something <<< $variable is significantly slower than: echo $variable | something so I replaced almost all instances of <<< with echo ...| I've seen speed differences of up to 10% but it's not consistent, so this is just @@ -2371,7 +2371,7 @@ test for there in this case. So leaving gtk version bugs unhandled due to no user information or feedback, if you want it fixed or if it works for your distro, let me know and also if it does not work, tell -me the correct commmand, with its output, to get gtk version. +me the correct command, with its output, to get gtk version. That's for inxi -Sx output that is. @@ -2460,7 +2460,7 @@ of debugging output and fix it at that point. This fix repairs an existing xorg bug that is unlikely to get fixed any time soon (the call to load the detected drivers, eg, vesa, intel, is repeated, causing a failure of driver already loaded on the second -occurance. +occurrence. ----------------------------------- -- Harald Hope - Mon, 12 Aug 2013 16:20:51 -0700 @@ -2500,7 +2500,7 @@ Changes: ----------------------------------- New version, new tarball. The recent bug fixes reminded me to check for ARM working, that had some bugs too, so I've updated that. -f for ARM now shows features instead of flags, and the -C regular cpu output does not -show cache/flags for arm cpus becuase they don't have those features. +show cache/flags for arm cpus because they don't have those features. Added some flags passed to various cpu functions and better detections of ARM cpu to handle dual core and other issues that were not handled before as well, or at all.