diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2008-10-07 23:16:39 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2008-10-07 23:16:39 +0000 |
| commit | 3b4998e87a80fce10cf86d3cb790686efb3b28e3 (patch) | |
| tree | 8e9257206906edb18b302a94a9c90d54f041e11b /sci-geosciences | |
| parent | Stop using a patch to fix the problem of linking to the original poppler libr... (diff) | |
| download | gentoo-2-3b4998e87a80fce10cf86d3cb790686efb3b28e3.tar.gz gentoo-2-3b4998e87a80fce10cf86d3cb790686efb3b28e3.tar.bz2 gentoo-2-3b4998e87a80fce10cf86d3cb790686efb3b28e3.zip | |
josm: fix http_proxy usage if no protocol is set
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc9-00169-gb34c873 x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/josm/ChangeLog | 5 | ||||
| -rwxr-xr-x | sci-geosciences/josm/files/josm-r1 | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog index 35a10172ba19..88c4d5d7d3f2 100644 --- a/sci-geosciences/josm/ChangeLog +++ b/sci-geosciences/josm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-geosciences/josm # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.16 2008/07/27 22:50:57 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.17 2008/10/07 23:16:39 hanno Exp $ + + 07 Oct 2008; Hanno Boeck <hanno@gentoo.org> files/josm-r1: + Fix for setting http_proxy without protocol. *josm-1.5_p736 (27 Jul 2008) diff --git a/sci-geosciences/josm/files/josm-r1 b/sci-geosciences/josm/files/josm-r1 index 8d9783e45639..48c34d8bb46d 100755 --- a/sci-geosciences/josm/files/josm-r1 +++ b/sci-geosciences/josm/files/josm-r1 @@ -4,6 +4,6 @@ if [ -z "$http_proxy" ]; then java -jar /usr/share/josm/lib/josm.jar else proxy_port=`echo $http_proxy|sed -e 's/.*://g'` - proxy_host=`echo $http_proxy|sed -e 's!.*://\(.*\):.*!\1!g'` + proxy_host=`echo $http_proxy|sed -e 's!\(.*://\)\?\(.*\):.*!\2!g'` java -Dhttp.proxyHost=$proxy_host -Dhttp.proxyPort=$proxy_port -jar /usr/share/josm/lib/josm.jar fi |