The following commit has been merged in the master branch:
commit 7cb5b60ea5474c84818b3c5813320ed7c2682801
Author: Mònica Ramírez Arceda <[email protected]>
Date: Sun Apr 14 01:24:50 2013 +0200
Fix sed commands in debian/scripts/gpsprune
diff --git a/debian/changelog b/debian/changelog
index 3038312..def2d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ gpsprune (15-1) UNRELEASED; urgency=low
* debian/copyright:
- Add required Copyright field to tim/prune/function/srtm/gen/ files
- Update years
+ * debian/scripts/gpsprune:
+ - Fix sed commands, when there is no host/port, proxyhost/proxyport
+ variables must be empty.
+ Thanks to Simó Albert i Beltran <[email protected]> and to
+ <[email protected]> for the patch!
-- Mònica Ramírez Arceda <[email protected]> Sat, 13 Apr 2013 23:55:39 +0200
diff --git a/debian/scripts/gpsprune b/debian/scripts/gpsprune
index c5ab6cd..18237a2 100644
--- a/debian/scripts/gpsprune
+++ b/debian/scripts/gpsprune
@@ -2,8 +2,8 @@
PRUNEJAR=/usr/share/gpsprune/gpsprune.jar
JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
-proxyhost=$(echo $http_proxy | sed 's?http://\([^:]\+\).*?\1?')
-proxyport=$(echo $http_proxy | sed 's?http://[^:]\+:\([0-9]\+\)?\1?')
+proxyhost=$(echo $http_proxy | sed -n 's?http://\([^:/]\+\).*?\1?p')
+proxyport=$(echo $http_proxy | sed -n 's?http://[^:]\+:\([0-9]\+\).*?\1?p')
if [ -z $proxyport ] ; then
if [ -z $proxyhost ] ; then
--
Tool to visualize, edit, convert and prune GPS data
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
