system/epson-inkjet-printer-escpr2: Updated for version 1.1.20.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 71 insertions, 37 deletions

diff --git a/system/epson-inkjet-printer-escpr2/README b/system/epson-inkjet-printer-escpr2/README
index 85e7504fe4..ac28a3caac 100644
--- a/system/epson-inkjet-printer-escpr2/README
+++ b/system/epson-inkjet-printer-escpr2/README
@@ -5,3 +5,4 @@ If your printer is not listed, try the escpr package instead.
 See README.models for supported printer models.
 
 don't forget to restart cups after installing/updating this driver
+You will have to print a page in order to get an acurate ink status.
diff --git a/system/epson-inkjet-printer-escpr2/README.models b/system/epson-inkjet-printer-escpr2/README.models
index aadabd2eb4..dd6a06e725 100644
--- a/system/epson-inkjet-printer-escpr2/README.models
+++ b/system/epson-inkjet-printer-escpr2/README.models
@@ -1,33 +1,34 @@
-EC-4020 Series, EC-4030 Series, EC-4040 Series, EC-C7000 Series,
-EP-50V Series, EP-879A Series, EP-880A Series, EP-881A Series,
-EP-882A Series, EP-982A3 Series, ET-15000 Series, ET-16150 Series,
-ET-16600 Series, ET-16650 Series, ET-3700 Series, ET-3710 Series,
-ET-3750 Series, ET-3760 Series, ET-4750 Series, ET-4760 Series,
-ET-5800 Series, ET-5850 Series, ET-5880 Series, ET-8700 Series,
-ET-M1140 Series, ET-M1170 Series, ET-M1180 Series, ET-M2140 Series,
-ET-M2170 Series, ET-M3140 Series, ET-M3170 Series, ET-M3180 Series,
-EW-M5610FT Series, EW-M630T Series, EW-M670FT Series, EW-M752T Series,
-L11160 Series, L14150 Series, L15150 Series, L15160 Series,
-L6160 Series, L6170 Series, L6190 Series, L6550 Series, L6570 Series,
-L6580 Series, M1140 Series, M1170 Series, M1180 Series, M15140 Series,
-M2140 Series, M2170 Series, M3140 Series, M3170 Series, M3180 Series,
-PM-520 Series, PX-M270FT Series, PX-M270T Series, PX-M380F,
-PX-M381FL, PX-M5080F Series, PX-M5081F Series, PX-M6711FT Series,
-PX-M6712FT Series, PX-M680F Series, PX-M7070FX, PX-M7080FX,
-PX-M7090FX, PX-M7110F, PX-M7110FP, PX-M780F Series, PX-M781F Series,
-PX-M791FT Series, PX-M880FX, PX-M884F, PX-M885F, PX-M886FL,
-PX-S270T Series, PX-S380, PX-S381L, PX-S5010 Series, PX-S5080 Series,
-PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S880X, PX-S884, PX-S885,
-ST-3000 Series, ST-4000 Series, ST-C8000 Series, ST-M1000 Series,
-ST-M3000 Series, WF-2860 Series, WF-3720 Series, WF-3730 Series,
-WF-3820 Series, WF-4720 Series, WF-4730 Series, WF-4740 Series,
-WF-4820 Series, WF-4830 Series, WF-7210 Series, WF-7710 Series,
-WF-7720 Series, WF-7820 Series, WF-7830 Series, WF-7840 Series,
-WF-C5210 Series, WF-C5290 Series, WF-C5290BA, WF-C529R Series,
-WF-C529RB, WF-C5710 Series, WF-C5790 Series, WF-C5790BA,
-WF-C579R Series, WF-C579RB, WF-C8190 Series, WF-C8190B,
-WF-C8610 Series, WF-C8690 Series, WF-C8690B, WF-C869R Series,
-WF-C878R Series, WF-C878RB, WF-C879R Series, WF-C879RB,
-WF-M5298 Series, WF-M5299 Series, WF-M5799 Series, XP-15000 Series,
-XP-5100 Series, XP-6000 Series, XP-6100 Series, XP-8500 Series,
-XP-8600 Series, XP-970 Series
+EC-4020 Series, EC-4030 Series, EC-4040 Series, EC-C7000 Series
+EP-50V Series, EP-879A Series, EP-880A Series, EP-881A Series
+EP-882A Series, EP-982A3 Series, ET-15000 Series, ET-16150 Series
+ET-16600 Series, ET-16650 Series, ET-3700 Series, ET-3710 Series
+ET-3750 Series, ET-3760 Series, ET-4750 Series, ET-4760 Series
+ET-5800 Series, ET-5850 Series, ET-5880 Series, ET-8700 Series
+ET-M1140 Series, ET-M1170 Series, ET-M1180 Series, ET-M2140 Series
+ET-M2170 Series, ET-M3140 Series, ET-M3170 Series, ET-M3180 Series
+EW-M5610FT Series, EW-M630T Series, EW-M670FT Series, EW-M752T Series
+L11160 Series, L14150 Series, L15150 Series, L15160 Series
+L6160 Series, L6170 Series, L6190 Series, L6550 Series, L6570 Series
+L6580 Series, M1140 Series, M1170 Series, M1180 Series, M15140 Series
+M2140 Series, M2170 Series, M3140 Series, M3170 Series, M3180 Series
+PM-520 Series, PX-M270FT Series, PX-M270T Series, PX-M380F, PX-M381FL
+PX-M5080F Series, PX-M5081F Series, PX-M6010F Series, PX-M6011F Series
+PX-M6711FT Series, PX-M6712FT Series, PX-M680F Series, PX-M7070FX
+PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP, PX-M730F Series
+PX-M780F Series, PX-M781F Series, PX-M791FT Series, PX-M880FX, PX-M884F
+PX-M885F, PX-M886FL, PX-S270T Series, PX-S380, PX-S381L
+PX-S5010 Series, PX-S5080 Series, PX-S6710T Series, PX-S7070X
+PX-S7090X, PX-S7110, PX-S7110P, PX-S880X, PX-S884, PX-S885
+ST-3000 Series, ST-4000 Series, ST-C8000 Series, ST-M1000 Series
+ST-M3000 Series, WF-2860 Series, WF-3720 Series, WF-3730 Series
+WF-3820 Series, WF-4720 Series, WF-4730 Series, WF-4740 Series
+WF-4820 Series, WF-4830 Series, WF-7210 Series, WF-7710 Series
+WF-7720 Series, WF-7820 Series, WF-7830 Series, WF-7840 Series
+WF-C5210 Series, WF-C5290 Series, WF-C5290BA, WF-C529R Series
+WF-C529RB, WF-C5710 Series, WF-C5790 Series, WF-C5790BA
+WF-C579R Series, WF-C579RB, WF-C8190 Series, WF-C8190B, WF-C8610 Series
+WF-C8690 Series, WF-C8690B, WF-C869R Series, WF-C878R Series, WF-C878RB
+WF-C879R Series, WF-C879RB, WF-M5298 Series, WF-M5299 Series
+WF-M5799 Series, XP-15000 Series, XP-5100 Series, XP-6000 Series
+XP-6100 Series, XP-8500 Series, XP-8600 Series, XP-970 Series
+XP-6100 Series, XP-8500 Series, XP-8600 Series, XP-970 Series
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
index e39f61cb23..38841ba1a3 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
@@ -25,8 +25,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#note to self. paste list of supported models into first line of empty README.models
+#file. run sh ./fixrm to spread the model list evenly over as many lines as needed
+
 PRGNAM=epson-inkjet-printer-escpr2
-VERSION=${VERSION:-1.1.19}
+VERSION=${VERSION:-1.1.20}
 EXTRABIT=1lsb3.2
 TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz
 BUILD=${BUILD:-1}
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
index e9430f76aa..6c98578716 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
@@ -1,8 +1,8 @@
 PRGNAM="epson-inkjet-printer-escpr2"
-VERSION="1.1.19"
+VERSION="1.1.20"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/11/87/06/352b6c4685a389d79b0cad4b5ae3494050b440c4/epson-inkjet-printer-escpr2-1.1.19-1lsb3.2.src.rpm"
-MD5SUM="1cb2a9f73fcc575cc197596c0653e11c"
+DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/11/94/33/2b6fbaf2f8f1c274ac7c492e7e1e1fd05762463f/epson-inkjet-printer-escpr2-1.1.20-1lsb3.2.src.rpm"
+MD5SUM="38453bc5d8243e3d99a0f2b28984b349"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/epson-inkjet-printer-escpr2/fixrm b/system/epson-inkjet-printer-escpr2/fixrm
new file mode 100644
index 0000000000..ffc0942dd7
--- /dev/null
+++ b/system/epson-inkjet-printer-escpr2/fixrm
@@ -0,0 +1,29 @@
+#!/bin/sh
+#fixrm is a little script to limit the items on each line so the line
+#is less than 72 characters. it is used by the maintainer when creating
+#the README.models file for this package, and for the epson-inkjet-printer-escpr2
+#slackbuild. It takes the list posted on a single long first line, and spreads
+#them over as many lines as needed.
+#
+#paste the list from the epson website into an empty README.models and run this
+#script in the same directory
+
+FNAME="README.models"
+MAXLEN=${MAXLEN:-72}
+#make sure MAXLEN is a integer bigger than 39
+MAXLEN=`echo $MAXLEN|awk '($1<40) {print "40"} (int($1)>39) {print int($1) }'`
+if [ -e $FNAME ]&&[ `cat $FNAME|head -n1|awk '{print length($0)}'` -gt $MAXLEN ]; then
+  #only do something if the file exists, and thefirst line is longer than  it
+  #should be.
+  TMPFILE=rmtmp
+  mv README.models $TMPFILE
+  cat $TMPFILE|awk -v mlen="$MAXLEN" -F', ' 'BEGIN{curline="";mlen=mlen-2}
+{ for (i=1;i<=NF; i++)
+ { { n=0; l=length(curline)+length($i) }
+   if (l<mlen) { curline=curline ", " $i; n=1}
+   if (n==0) {print curline; curline=$i }
+ }
+ if (length(curline)>0) {print curline}
+}'>README.models
+  rm $TMPFILE
+fi