...
 
Commits (4)
Change log for ethstats, the network traffic statistics utility
1.2.1 not yet ;)
- fix a bashism in the check for feature-check
- use single quotes and "--" in shell commands in the Makefile
1.2.0 2018/05/17
- fix a Perl 6 bug: allow the ".", "/", and "-" characters in
an interface name
......
......@@ -33,49 +33,49 @@ INSTALL_SCRIPT?= ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
all: ${SCRIPT} ${MAN1GZ}
clean:
${RM} ${SCRIPT} ${MAN1GZ}
${RM} -- '${SCRIPT}' '${MAN1GZ}'
install: all
${MKDIR} ${DESTDIR}${BINDIR}
${INSTALL_SCRIPT} ${SCRIPT} ${DESTDIR}${BINDIR}/
${MKDIR} ${DESTDIR}${MANDIR}1
${INSTALL_SCRIPT} ${MAN1GZ} ${DESTDIR}${MANDIR}1/
${MKDIR} -- '${DESTDIR}${BINDIR}'
${INSTALL_SCRIPT} -- '${SCRIPT}' '${DESTDIR}${BINDIR}/'
${MKDIR} -- '${DESTDIR}${MANDIR}1'
${INSTALL_SCRIPT} -- '${MAN1GZ}' '${DESTDIR}${MANDIR}1/'
test: all
@echo "=== Perl syntax check"
${PERL} -c ${TEST_SCRIPT}
@echo '=== Perl syntax check'
'${PERL}' -c '${TEST_SCRIPT}'
@echo "=== Basic version/usage functionality"
${TEST_SCRIPT} -V -h
@echo '=== Basic version/usage functionality'
'${TEST_SCRIPT}' -V -h
@echo
@echo "=== Long options for version and usage"
${TEST_SCRIPT} --version
${TEST_SCRIPT} --help
@echo "=== The features long option"
${TEST_SCRIPT} --features
${TEST_SCRIPT} --features | fgrep -qe ' ethstats='
if [ -f "`type -p feature-check 2>/dev/null`" ] && [ -x "`type -p feature-check 2>/dev/null`" ] && feature-check feature-check feature-check; then \
echo "=== Feature checks"; \
feature-check -l -- ${TEST_SCRIPT}; \
feature-check -- ${TEST_SCRIPT} ethstats; \
feature-check -- ${TEST_SCRIPT} ethstats ge 1; \
feature-check -- ${TEST_SCRIPT} 'ethstats lt 1000'; \
@echo '=== Long options for version and usage'
'${TEST_SCRIPT}' --version
'${TEST_SCRIPT}' --help
@echo '=== The features long option'
'${TEST_SCRIPT}' --features
'${TEST_SCRIPT}' --features | fgrep -qe ' ethstats='
if feature-check feature-check feature-check 2>/dev/null; then \
echo '=== Feature checks'; \
feature-check -l -- '${TEST_SCRIPT}'; \
feature-check -- '${TEST_SCRIPT}' ethstats; \
feature-check -- '${TEST_SCRIPT}' ethstats ge 1; \
feature-check -- '${TEST_SCRIPT}' 'ethstats lt 1000'; \
else \
echo "=== Skipping the feature checks - the feature-check tool does not seem to be installed"; \
echo '=== Skipping the feature checks - the feature-check tool does not seem to be installed'; \
fi
@echo "=== Error out on invalid options"
! ${TEST_SCRIPT} -X
! ${TEST_SCRIPT} --whee
@echo '=== Error out on invalid options'
! '${TEST_SCRIPT}' -X
! '${TEST_SCRIPT}' --whee
@echo
@if [ -r "/proc/net/dev" ]; then \
echo "=== A single run"; \
${TEST_SCRIPT} -n3 -c2; \
@if [ -r '/proc/net/dev' ]; then \
echo '=== A single run'; \
'${TEST_SCRIPT}' -n3 -c2; \
else \
echo "=== Skipping the single run"; \
echo '=== Skipping the single run'; \
fi
@echo
......@@ -83,9 +83,9 @@ test-p6:
${MAKE} TEST_SCRIPT=./ethstats.p6 PERL=perl6 test
${SCRIPT}: ${SRC}
${INSTALL_EXEC} ${SRC} ${SCRIPT}
${INSTALL_EXEC} -- '${SRC}' '${SCRIPT}'
${MAN1GZ}: ${MAN1}
${GZIP} ${MAN1} > ${MAN1GZ} || (${RM} ${MAN1GZ}; false)
${GZIP} -- '${MAN1}' > '${MAN1GZ}' || (${RM} -- '${MAN1GZ}'; false)
.PHONY: all clean install test
......@@ -10,7 +10,7 @@ use strict;
use Getopt::Tiny;
use Terminal::ANSIColor;
constant VERSION = '1.2.0';
constant VERSION = '1.2.1';
sub version()
{
......
......@@ -14,7 +14,7 @@ use v5.010;
use strict;
use warnings;
use version; our $VERSION = version->declare("1.2.0");
use version; our $VERSION = version->declare("1.2.1");
use Getopt::Std;
......