Date: Sun, 15 Feb 2015 13:43:00 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379036 - head/print/foomatic-db-engine/files Message-ID: <201502151343.t1FDh0Du046669@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Sun Feb 15 13:42:59 2015 New Revision: 379036 URL: https://svnweb.freebsd.org/changeset/ports/379036 QAT: https://qat.redports.org/buildarchive/r379036/ Log: Add a patch, that removes the reference to bash from one of the installed scripts. (This was caught by the "QA step" here.) Added: head/print/foomatic-db-engine/files/ head/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in (contents, props changed) Added: head/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in Sun Feb 15 13:42:59 2015 (r379036) @@ -0,0 +1,44 @@ +Do not require bash -- BSD sh(1) is perfectly capable of executing +this script. + +While here, replace use of perl in removal of some characters from +streams with the much lighter tr(1) invocations. Strip out +carriage-returns (\r) characters from remote printer's responses too. + +Remove useless braces around variable-names. + + -mi + +--- foomatic-getpjloptions.in 2015-02-14 07:21:56.000000000 -0500 ++++ foomatic-getpjloptions.in 2015-02-15 07:36:23.000000000 -0500 +@@ -1,3 +1,3 @@ +-#!@SH@ ++#!/bin/sh + # + # Polls PJL options from local or network printers +@@ -23,6 +23,5 @@ + NC=@NC@ + CAT=@CAT@ +-PRINTF=@PRINTF@ +-PERL=@PERL@ ++PRINTF=printf # sh builtin + + usage(){ +@@ -63,12 +62,13 @@ +- # We have two arguments, do ethernet printer request ++ # We have two arguments, do network printer request + # Poll the printer's answer and filter out the newpage characters ++ # as well as the carriage-returns (\r or, in octal, 015) +- ${NC} -w 3 ${1} ${2} 2>/dev/null | ${PERL} -p -e "s/\014//" ++ $NC -w 3 $1 $2 2>/dev/null | tr -d "\015\014" + else + # We have one argument, do local printer request + # Send commands to printer port +- ${CAT} > ${1} ++ $CAT > $1 + # Wait ten seconds for the printer to process the request + sleep 10 + # Poll the printer's answer and filter out the newpage and CR characters +- ${CAT} < ${1} | ${PERL} -p -e "s/[\015\014]//" ++ exec tr -d "\015\014" < $1 + fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502151343.t1FDh0Du046669>