summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-04-26 21:00:52 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2010-04-26 21:00:52 +0200
commit382fc245366999b540bf547b9ccb2f9529a2116b (patch)
treee1c9b7bc4f19b2b80cfe378def0ea40a998ca2ab
parentb1a2658b5ca2f54e3e378b0bc9a1741a81a10c03 (diff)
Slight makefile/manpage cleanups, release v1.1.1 while at it1.1.1
-rw-r--r--Changelog4
-rw-r--r--Makefile18
-rwxr-xr-xbin/efa18
3 files changed, 23 insertions, 17 deletions
diff --git a/Changelog b/Changelog
index fd86b12..89df586 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+efa 1.1.1 - Mon Apr 26 2010
+
+ * Add short options
+
efa 1.1 - Sun Jan 17 2010
* Code cleanup and DRY-ing
diff --git a/Makefile b/Makefile
index eb1d658..e5891da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,21 @@
-prefix ?= /usr/local
+PREFIX ?= /usr/local
+
+basedir = ${DESTDIR}${PREFIX}
build/efa.1: bin/efa
mkdir -p build
pod2man $< > $@
install: build/efa.1
- mkdir -p $(prefix)/bin $(prefix)/share/man/man1
- cp bin/efa $(prefix)/bin/efa
- cp build/efa.1 $(prefix)/share/man/man1/efa.1
- chmod 755 $(prefix)/bin/efa
- chmod 644 $(prefix)/share/man/man1/efa.1
+ mkdir -p ${basedir}/bin ${basedir}/share/man/man1
+ cp bin/efa ${basedir}/bin/efa
+ cp build/efa.1 ${basedir}/share/man/man1/efa.1
+ chmod 755 ${basedir}/bin/efa
+ chmod 644 ${basedir}/share/man/man1/efa.1
uninstall:
- rm -f $(prefix)/bin/efa
- rm -f $(prefix)/share/man/man1/efa.1
+ rm -f ${basedir}/bin/efa
+ rm -f ${basedir}/share/man/man1/efa.1
clean:
rm -rf build
diff --git a/bin/efa b/bin/efa
index ebc490d..72d6ed8 100755
--- a/bin/efa
+++ b/bin/efa
@@ -13,7 +13,7 @@ use WWW::Mechanize;
my $firsturl = 'http://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2?language=de&itdLPxx_transpCompany=vrr';
my $posturl = 'http://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2';
-my $version = '1.1+git';
+my $version = '1.1.1+git';
my $content;
my %post;
my $www = WWW::Mechanize->new(
@@ -407,7 +407,7 @@ efa - unofficial efa.vrr.de command line client
=head1 DESCRIPTION
B<efa> is a command line client for the L<http://efa.vrr.de> web interface.
-It sends the specified information to the online form and displays the results
+It sends the specified information to the online form and displays the results.
=head1 OPTIONS
@@ -430,8 +430,8 @@ Travel via this place
Designate type of the I<stop> for from/to/via.
Possible I<type>s: B<stop> (default), B<address>, B<poi> (point of interest)
-As an alternative to these options, it is possible to specify the I<stop>
-of the to/from/via options as "addr:I<stop>" or "poi:I<stop>", respectively.
+Alternatively, you can specify the I<stop> of the from/to/via options as
+"addr:I<stop>" or "poi:I<stop>", respectively
=item B<-t>|B<--time>|B<--depart> I<hh>:I<mm>
@@ -447,7 +447,7 @@ Journey date
=item B<-b>|B<--bike>
-Choose connections where you can take a bike with you
+Choose connections allowing to carry a bike
=item B<-e>|B<--exclude> I<transports>
@@ -512,7 +512,7 @@ Accepted values: normal (default), fast, slow
=item B<-I>|B<--ignore-info> [ I<regex> ]
-Ignore additional information matching I<regex> (default: /Fahrradmitnahme/).
+Ignore additional information matching I<regex> (default: /Fahrradmitnahme/)
If I<regex> is not supplied, removes the default regex (-E<gt> nothing will be ignored)
@@ -527,7 +527,7 @@ Add I<key> with I<value> to the HTTP POST request sent to the EFA server.
This can be used to use setting B<efa> does not yet cover, like
C<--post lineRestriction=400> to also show IC and ICE trains.
Note that B<--post> will be overridden by the standard efa options, such as
-B<--time>.
+B<--time>
=item B<-v>|B<--version>
@@ -537,5 +537,5 @@ Print version information
=head1 BUGS
-Arguments to B<efa> should be plain ASCII. Unicode may work, but it cannot be
-guaranteed.
+The Unicode handling is slightly messed up. Therefore, arguments to B<efa>
+should always be plain ASCII (ue instead of E<uuml> etc).