Moved copy and symlinks from ppd files from install script into PKGBUILD and updated version.

3 files changed, 47 insertions, 130 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d152e197c031..3a944651b09c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kyocera_universal
 	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog9).
-	pkgver = 9.1.20220203
-	pkgrel = 2
+	pkgver = 9.2.20220928
+	pkgrel = 1
 	url = https://www.kyocera.com/
 	install = kyodialog-bin.install
 	arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = kyocera_universal
 	depends = zlib
 	provides = kyocera-cups
 	conflicts = kyocera-cups
-	source = https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_20220203_tar_gz.download.gz
-	md5sums = 6bc001940c9d4cb8e287bf23f708008c
+	source = https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_20220928_tar_gz.download.gz
+	md5sums = e76eabb903e07ef15f62c963a717a539
 
 pkgname = kyocera_universal
diff --git a/PKGBUILD b/PKGBUILD
index 6b339a11c241..39ee94502330 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Dominik Wetzel <dimonok@web.de>
-# Contributors: Julian Eckhardt <julian@eckhardt.fi>, Paulo Marcos <contato-myghi63@protonmail.com>
+# Maintainer: Dominik Wetzel <dimonok [at] web [dot] de>
+# Contributors: Julian Eckhardt <julian [at] eckhardt [dot] fi>, Paulo Marcos <contato-myghi63 [at] protonmail [dot] com>
 pkgname=kyocera_universal
-pkgver=9.1.20220203
-pkgrel=2
+pkgver=9.2.20220928
+pkgrel=1
 major=$(cut -d '.' -f 1 <<< $pkgver)
 minor=$(cut -d '.' -f 2 <<< $pkgver)
 date=$(cut -d '.' -f 3 <<< $pkgver)
@@ -18,7 +18,7 @@ DLAGENTS=("https::/usr/bin/wget")
 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=('6bc001940c9d4cb8e287bf23f708008c')
+md5sums=('e76eabb903e07ef15f62c963a717a539')
 
 if [ "$arch" == "x86_64" ]; then
   _arch="amd64"
@@ -40,12 +40,35 @@ prepare() {
 }
 
 package() {
-  # Remove unnecessary stuff
+  # Remove unnecessary stuff and move ppd files to appropriate folders
   cd $srcdir
-  rm -r usr/share/kyocera${major}.${minor}/Python || rm -r usr/share/kyocera${major}/Python
+  
+  version=${major}
+  KYOCERA_DIR=usr/share/kyocera${version}
+  if [ ! -d $KYOCERA_DIR ]; then 
+    version=${major}.${minor}
+    KYOCERA_DIR=usr/share/kyocera${version}
+  fi
   rm -r usr/share/applications
-  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}
+  
+  ALTERNATE_PPD_DIRECTORY=usr/share/cups/model
+  PRIMARY_PPD_DIRECTORY=usr/share/ppd/kyocera
+  
+  TEMP_PPD_DIRECTORY=${KYOCERA_DIR}/ppd${version}
+
+  mkdir -p $PRIMARY_PPD_DIRECTORY
+  mkdir -p $ALTERNATE_PPD_DIRECTORY
+  mv $TEMP_PPD_DIRECTORY/* $PRIMARY_PPD_DIRECTORY
+
+  chmod 755 usr/bin/kyoPPDWrite_H
+
+  if [ ! -h $ALTERNATE_PPD_DIRECTORY/kyocera ]; then
+      ln -s /$PRIMARY_PPD_DIRECTORY $ALTERNATE_PPD_DIRECTORY/kyocera
+  fi
+  
+  rm -r ${KYOCERA_DIR}
+  
+  rm usr/bin/kyodialog${version}
   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 0f8a6aa7b7c0..9783b02b6800 100755
--- a/kyodialog-bin.install
+++ b/kyodialog-bin.install
@@ -1,43 +1,6 @@
-major=9
-minor=1
-
-pre_install() {
-
-	PHASE2_PPDS=/usr/share/cups/model/kyocera/
-	PHASE3_PPDS=/usr/share/ppd/kyocera/
-
-
-	if [ -d $PHASE2_PPDS  ]; then
-	    rm -rvf $PHASE2_PPDS
-	fi
-
-	if [ -d $PHASE3_PPDS  ]; then
-	    rm -rvf $PHASE3_PPDS
-	fi
-}
-
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 
-	ALTERNATE_PPD_DIRECTORY=/usr/share/cups/model/kyocera
-	PRIMARY_PPD_DIRECTORY=/usr/share/ppd/kyocera/
-	
-	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/kyocera${major} || chmod 777 /usr/share/kyocera${major}.${minor}
-	chmod 755 /usr/bin/kyoPPDWrite_H
-
-	if [ ! -h $ALTERNATE_PPD_DIRECTORY ]; then
-	    ln -s $PRIMARY_PPD_DIRECTORY $ALTERNATE_PPD_DIRECTORY
-	fi
-
 	mime_line="application/postscript      application/vnd.cups-pdf 66  gstopdf"
 	cups_conf='/etc/cups/local.convs'
 	if [ -e $cups_conf ]; then
@@ -48,10 +11,6 @@ post_install() {
 	update-desktop-database -q
 }
 
-pre_upgrade() {
-	pre_install
-}
-
 post_upgrade() {
 	post_install
 }
@@ -59,87 +18,22 @@ post_upgrade() {
 post_remove() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 
-	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\|kyofilter_kpsl_H" /etc/cups/ppd/* 2>/dev/null`
-	    if [ ! -z "$files" ]; then
-	        for file in ${files}; do
-	            if matches $file .ppd; then
-	                basefile=$(basename $file .ppd)
-	                lpadmin -x $basefile
-	            fi
-	        done
-	    fi
-	}
-
-	get_user_printer_list(){
-	    # $1 is user
-	    if [ -d $KYOCERA_CONFIG/$1  ]; then 
-	        echo `ls $KYOCERA_CONFIG/$1`
-	    fi
-	}
-
-	uninstall_kyocera_config_files(){
-	    # $1 is user
-	    # $2 is printer list
-	    rm -rf "$KYOCERA_CONFIG/$1/"
-	}
-
-	uninstall_lpoptions_config_files(){
-	    # $1 is user
-	    # $2 is printer list
-
-	    lp_options="/home/$1/.cups/lpoptions"
-
-	    #echo "Editing lpoptions config file"
-	    if [ ! -z $2 ]; then 
-	        for printer in ${printers}; do
-	            #echo "sed $base_printer $lp_options"
-	            sed -i "s/\(Dest\|Default\) $base_printer.*//" $lp_options
-	        done
-	    fi
-	}
-
-	uninstall_config_files(){
-	    #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 'ppd${major}\|ppd${major}.${minor}\|appicon\|Python'`
-	        if [ ! -z "$users" ]; then
-	            for user in ${users}; do
-	                is_appicon=`matches $user appicon.png`
-	                is_python=`matches $user Python`
-	                if [ ! $is_appicon ] && [ ! $is_python ] ;then
-	                    printers=`get_user_printer_list $user`
-	                    uninstall_kyocera_config_files $user $printers
-	                    uninstall_lpoptions_config_files $user $printers
-	                fi
-	            done
-	        fi
-	    fi
-	}
-
-	{
-	    rm -rf /usr/share/cups/model/kyocera
-	    if [ -d /usr/share/ppd/kyocera ]; then
-	        rm -rf "/usr/share/ppd/kyocera"
-	    fi
-	}
-
 	matches(){
 	    input="$1"
 	    pattern="$2"
 	    echo "$input" | grep -q "$pattern"
 	}
-
-
-	uninstall_printers
-	uninstall_config_files
+	
+	# Uninstall printers
+	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
+				basefile=$(basename $file .ppd)
+				lpadmin -x $basefile
+			fi
+		done
+	fi
 
 	#echo ""
 	update-desktop-database -q