Updated to new version. Made it more dynamic

3 files changed, 34 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91788da18f7f..4904157caeee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kyocera_universal
-	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog8).
-	pkgver = 9.0.0
+	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog9).
+	pkgver = 9.1.20220203
 	pkgrel = 1
 	url = https://www.kyocera.com/
 	install = kyodialog-bin.install
@@ -18,8 +18,9 @@ pkgbase = kyocera_universal
 	depends = libgcrypt
 	depends = python-reportlab
 	depends = python-setuptools
+	depends = python-pypdf3
 	depends = zlib
-	source = https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_20210527_tar_gz.download.gz
-	md5sums = 5079cb91b5a62e51817740187d12cad4
+	source = https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_20220203_tar_gz.download.gz
+	md5sums = 6bc001940c9d4cb8e287bf23f708008c
 
 pkgname = kyocera_universal
diff --git a/PKGBUILD b/PKGBUILD
index 735fc835ab60..9edae28fceb6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
 # Maintainer: Dominik Wetzel <dimonok@web.de>
 # Contributors: Julian Eckhardt <julian@eckhardt.fi>, Paulo Marcos <contato-myghi63@protonmail.com>
 pkgname=kyocera_universal
-pkgver=9.0.0
+pkgver=9.1.20220203
 pkgrel=1
-pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog9)."
+major=$(cut -d '.' -f 1 <<< $pkgver)
+minor=$(cut -d '.' -f 2 <<< $pkgver)
+date=$(cut -d '.' -f 3 <<< $pkgver)
+pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog${major})."
 arch=('x86_64' 'i686')
 url="https://www.kyocera.com/"
 license=('other')
-depends=('cups-filters' 'dbus' 'gcc-libs' 'glibc' 'krb5' 'libcups' 'libgcrypt' 'python-reportlab' 'python-setuptools' 'zlib')
+depends=('cups-filters' 'dbus' 'gcc-libs' 'glibc' 'krb5' 'libcups' 'libgcrypt' 'python-reportlab' 'python-setuptools' 'python-pypdf3' 'zlib')
 makedepends=('unzip' 'wget')
 DLAGENTS=("https::/usr/bin/wget")
-toDwnld="KyoceraLinuxPackages_20210527_tar_gz.download.gz"
+toDwnld="KyoceraLinuxPackages_${date}_tar_gz.download.gz"
 source=("https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/${toDwnld}")
 install=kyodialog-bin.install
-md5sums=('5079cb91b5a62e51817740187d12cad4')
+md5sums=('6bc001940c9d4cb8e287bf23f708008c')
 
 if [ "$arch" == "x86_64" ]; then
   _arch="amd64"
@@ -21,8 +24,6 @@ else
   _arch="i386"
 fi
 
-major=${pkgver%.*.*}
-
 ###########################
 # CHOOSE YOUR REGION HERE #
 ###########################
@@ -32,17 +33,17 @@ Region="Global"
 prepare() {
   cd $srcdir
   tar xzf ${toDwnld} -C .
-  ar xv Debian/${Region}/kyodialog_${_arch}/kyodialog_${major}.0-0_${_arch}.deb
+  ar xv Debian/${Region}/kyodialog_${_arch}/kyodialog_${major}.${minor}-0_${_arch}.deb
   tar xzf data.tar.gz -C .
 }
 
 package() {
   # Remove unnecessary stuff
   cd $srcdir
-  rm -r usr/share/kyocera${major}/Python
+  rm -r usr/share/kyocera${major}.${minor}/Python || rm -r usr/share/kyocera${major}/Python
   rm -r usr/share/applications
-  rm usr/share/kyocera${major}/appicon_H.png
-  rm usr/bin/kyodialog${major}
+  rm -r usr/share/kyocera${major}.${minor}/appicon_H.png || rm usr/share/kyocera${major}/appicon_H.png
+  rm usr/bin/kyodialog${major}.${minor} || rm usr/bin/kyodialog${major}
   install -D -m644 "usr/share/doc/kyodialog/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
   rm -r ${srcdir}/usr/share/doc
   cd $pkgdir
diff --git a/kyodialog-bin.install b/kyodialog-bin.install
index cb43f9dbe1eb..0f8a6aa7b7c0 100755
--- a/kyodialog-bin.install
+++ b/kyodialog-bin.install
@@ -1,3 +1,6 @@
+major=9
+minor=1
+
 pre_install() {
 
 	PHASE2_PPDS=/usr/share/cups/model/kyocera/
@@ -18,12 +21,17 @@ post_install() {
 
 	ALTERNATE_PPD_DIRECTORY=/usr/share/cups/model/kyocera
 	PRIMARY_PPD_DIRECTORY=/usr/share/ppd/kyocera/
-	INSTALLED_PPD_DIRECTORY=/usr/share/kyocera9/ppd9
+	
+	INSTALLED_PPD_DIRECTORY=/usr/share/kyocera${major}/ppd${major}
+	
+	if [ ! -d $INSTALLED_PPD_DIRECTORY ]; then
+		INSTALLED_PPD_DIRECTORY=/usr/share/kyocera${major}.${minor}/ppd${major}.${minor}
+	fi
 
 	mkdir -p $PRIMARY_PPD_DIRECTORY
 	cp -r $INSTALLED_PPD_DIRECTORY/* $PRIMARY_PPD_DIRECTORY
 
-	chmod 777 /usr/share/kyocera9
+	chmod 777 /usr/share/kyocera${major} || chmod 777 /usr/share/kyocera${major}.${minor}
 	chmod 755 /usr/bin/kyoPPDWrite_H
 
 	if [ ! -h $ALTERNATE_PPD_DIRECTORY ]; then
@@ -51,10 +59,14 @@ post_upgrade() {
 post_remove() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 
-	KYOCERA_CONFIG="/usr/share/kyocera9"
+	KYOCERA_CONFIG="/usr/share/kyocera${major}"
+	
+	if [ ! -d $KYOCERA_CONFIG ]; then
+		KYOCERA_CONFIG="/usr/share/kyocera{major}.{minor}"
+	fi
 
 	uninstall_printers(){
-	    files=`grep -l "kyofilter_H\|kyofilter_ras_H\|kyofilter_pdf_H" /etc/cups/ppd/* 2>/dev/null`
+	    files=`grep -l "kyofilter_H\|kyofilter_ras_H\|kyofilter_pdf_H\|kyofilter_kpsl_H" /etc/cups/ppd/* 2>/dev/null`
 	    if [ ! -z "$files" ]; then
 	        for file in ${files}; do
 	            if matches $file .ppd; then
@@ -97,7 +109,7 @@ post_remove() {
 	    #For each user, uninstall the config files in
 	    #/usr/share/kyocera9/<username> and ~/.cups/lpoptions
 	    if [ -d $KYOCERA_CONFIG ]; then
-	        users=`ls $KYOCERA_CONFIG | grep -v 'ppd9\|appicon\|Python'`
+	        users=`ls $KYOCERA_CONFIG | grep -v 'ppd${major}\|ppd${major}.${minor}\|appicon\|Python'`
 	        if [ ! -z "$users" ]; then
 	            for user in ${users}; do
 	                is_appicon=`matches $user appicon.png`
@@ -117,9 +129,6 @@ post_remove() {
 	    if [ -d /usr/share/ppd/kyocera ]; then
 	        rm -rf "/usr/share/ppd/kyocera"
 	    fi
-	    if [ -d /usr/share/kyocera9/Python ]; then
-	        rm -rf "/usr/share/kyocera9/Python"
-	    fi
 	}
 
 	matches(){