Fix: rename irp2018 to irpf and make it generic

6 files changed, 35 insertions, 32 deletions

diff --git a/share/hoarder/irpf2018/info b/share/hoarder/irpf/info
index fd712fc..fd712fc 100644
--- a/share/hoarder/irpf2018/info
+++ b/share/hoarder/irpf/info
diff --git a/share/hoarder/irpf2018/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha1 b/share/hoarder/irpf/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha1
index 40718cb..40718cb 100644
--- a/share/hoarder/irpf2018/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha1
+++ b/share/hoarder/irpf/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha1
diff --git a/share/hoarder/irpf2018/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha256 b/share/hoarder/irpf/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha256
index 32626f0..32626f0 100644
--- a/share/hoarder/irpf2018/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha256
+++ b/share/hoarder/irpf/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha256
diff --git a/share/hoarder/irpf2018/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha512 b/share/hoarder/irpf/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha512
index 5810bc4..5810bc4 100644
--- a/share/hoarder/irpf2018/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha512
+++ b/share/hoarder/irpf/unix/linux/hashes/IRPF2018Linux-x86_64v1.4.bin.sha512
diff --git a/share/hoarder/irpf/unix/linux/install b/share/hoarder/irpf/unix/linux/install
new file mode 100755
index 0000000..d0728fd
--- /dev/null
+++ b/share/hoarder/irpf/unix/linux/install
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+#
+# Install IRPF
+# Requires trashman/oracle-java8
+# https://idg.receita.fazenda.gov.br/interface/cidadao/irpf/2018/download/linux-bin-64-bits
+
+# Parameters
+SHARE="$1"
+LIB="$2"
+
+# Include basic functions
+. $LIB/trashman/functions || exit 1
+. $LIB/trashman/debian    || exit 1
+
+# Working folder
+CWD="`pwd`"
+WORK="`mktemp -d`" || exit 1
+
+YEAR="2018"
+FILE="IRPF2018Linux-x86_64v1.4.bin"
+
+# Download
+cd $WORK &> /dev/null
+wget -c http://downloadirpf.receita.fazenda.gov.br/irpf/$YEAR/irpf/arquivos/$FILE || exit 1
+cp $SHARE/hoarder/unix/linux/hashes/* . || exit 1
+sha1sum   -c ${FILE}.sha1               || exit 1
+sha256sum -c ${FILE}.sha256             || exit 1
+sha251sum -c ${FILE}.sha512             || exit 1
+chmod     +x ${FILE}                    || exit 1
+./${FILE}                               || exit 1
+cd $CWD
+rm -rf $WORK || exit 1
+
+# Run
+#/usr/bin/java -Xms128M -Xmx512M -jar /home/user/ProgramasRFB/IRPF${YEAR}/irpf.jar
diff --git a/share/hoarder/irpf2018/unix/linux/install b/share/hoarder/irpf2018/unix/linux/install
deleted file mode 100755
index c2cc641..0000000
--- a/share/hoarder/irpf2018/unix/linux/install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env sh
-#
-# Install IRPF 2018
-# Requires trashman/oracle-java8
-# https://idg.receita.fazenda.gov.br/interface/cidadao/irpf/2018/download/linux-bin-64-bits
-
-# Parameters
-SHARE="$1"
-LIB="$2"
-
-# Include basic functions
-. $LIB/trashman/functions || exit 1
-. $LIB/trashman/debian    || exit 1
-
-# Working folder
-CWD="`pwd`"
-WORK="`mktemp -d`" || exit 1
-
-# Download
-cd $WORK &> /dev/null
-wget -c http://downloadirpf.receita.fazenda.gov.br/irpf/2018/irpf/arquivos/IRPF2018Linux-x86_64v1.4.bin || exit 1
-chmod +x IRPF2018Linux-x86_64v1.4.bin            || exit 1
-./IRPF2018Linux-x86_64v1.4.bin                   || exit 1
-cp $SHARE/hoarder/unix/linux/hashes/* .          || exit 1
-sha1sum   -c IRPF2018Linux-x86_64v1.4.bin.sha1   || exit 1
-sha256sum -c IRPF2018Linux-x86_64v1.4.bin.sha256 || exit 1
-sha251sum -c IRPF2018Linux-x86_64v1.4.bin.sha512 || exit 1
-cd $CWD
-rm -rf $WORK || exit 1
-
-# Run
-#/usr/bin/java -Xms128M -Xmx512M -jar /home/user/ProgramasRFB/IRPF2018/irpf.jar