dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-16 16:21:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New version, new tarball. Fixed some lintian issues in man page, changed man/help for

Browse source 
-! location= option, to indicate that users must replace space with + themselves.

Because of how bash handles these options, inxi cannot add in + signs itself automatically.

This should be closer to cleanup of this new feature.
This commit is contained in:
inxi-svn 2013-05-18 17:52:16 +00:00
parent 63ae1f9273
commit 598fb932b2
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash
########################################################################
#### Script Name: inxi
#### Version: 1.9.04
#### Date: May 17 2013
#### Version: 1.9.5
#### Date: May 18 2013
#### Patch Number: 00
########################################################################
#### SPECIAL THANKS
@ -2556,7 +2556,7 @@ show_options()
if [[ $B_ALLOW_WEATHER == 'true' ]];then
print_screen_output "-! location=<location> - <location> Supported: postal code; city,[state/country]; latitude,longitude"
print_screen_output " Only use if you want the weather somewhere other than the machine running $SCRIPT_NAME."
print_screen_output " Must be used with -w. Only ascii, city/country names must not contain spaces: newyork,ny"
print_screen_output " Must be used with -w. Only ascii, replace spaces in city/state/country names with +: new+york,ny"
fi
if [[ $1 == 'full' ]];then
print_screen_output " "
@ -7980,8 +7980,9 @@ get_weather_data()
# first we get the location data, once that is parsed and handled, we move to getting the
# actual weather data, assuming no errors
if [[ -n $ALTERNATE_WEATHER_LOCATION ]];then
# note, this api does not support spaces in names
# note, this api does not support spaces in names, replace spaces with + sign.
location=$ALTERNATE_WEATHER_LOCATION
# echo $ALTERNATE_WEATHER_LOCATION;exit
else
if [[ $b_test_loc != 'true' ]];then
location_data=$( wget -q -t 1 -T $WGET_TIMEOUT -O- $location_site || wget_error=$? )

10
inxi.1
View file

@ -1,4 +1,4 @@
.TH INXI 1 "2013\-05\-17" inxi "inxi manual"
.TH INXI 1 "2013\-05\-18" inxi "inxi manual"
.SH NAME
inxi \- Command line system information script for console and IRC
@ -252,7 +252,7 @@ triggers \fB\-xx\fR extra data option.
.B \-w
Adds weather line. Note, this depends on an unreliable api so it may not always be working in the future.
To get weather for an alternate location, use also the \-! location=<location_string>. See also \-x, \-xx, \-xxx option.
Please note, your distribution's maintainer may chose to disable this feature, so if -w doesn't work, that's why.
Please note, your distribution's maintainer may chose to disable this feature, so if \-w doesn't work, that's why.
.TP
.B \-z
Adds security filters for IP addresses, Mac, location (\-w), and user home directory name. Default on for irc clients.
@ -386,9 +386,9 @@ Turns on hostname in System line. Overrides inxi config file value (if set): B_S
.TP
.B \-! location=<location_string>
With \-w, get weather for an alternate location. Accepts postal/zip code, city,state pair, or latitude,longitude.
Note: city/country/state names must not contain spaces! Only ascii letters in city/state/country names as well, sorry.
Examples: \-! location=95623 OR \-! location=Boston,MA OR \-! location=45.5234,\-122.6762 OR \-! location=newyork,ny
OR \-! location=bodo,norway
Note: city/country/state names must not contain spaces. Replace spaces with '+' sign. Must have space between -! and location=. No spaces around = sign. Use only ascii letters in city/state/country names, sorry.
Examples: \-! location=95623 OR \-! location=Boston,MA OR \-! location=45.5234,\-122.6762 OR \-! location=new+york,ny
OR \-! location=bodo,norway OR \-! location=
.SH DEBUGGING OPTIONS
.TP

17
inxi.changelog
View file

@ -1,3 +1,20 @@
=====================================================================================
Version: 1.9.5
Patch Version: 00
Script Date: May 18 2013
-----------------------------------
Changes:
-----------------------------------
New version, new tarball. Fixed some lintian issues in man page, changed man/help for
-! location= option, to indicate that users must replace space with + themselves.
Because of how bash handles these options, inxi cannot add in + signs itself automatically.
This should be closer to cleanup of this new feature.
-----------------------------------
-- Harald Hope - Sat, 18 May 2013 10:50:06 -0700
=====================================================================================
Version: 1.9.04
Patch Version: 00