Switched to bsdtar and cleaned up install file

3 files changed, 37 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc8ec140d1b1..6855ddeb715b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = canon-pixma-mx870-complete
 	pkgdesc = Complete stand alone driver set (printing and scanning) for Canon Pixma MX870
 	pkgver = 3.30
-	pkgrel = 7
+	pkgrel = 8
 	url = https://www.usa.canon.com/internet/portal/us/home/support/details/printers/support-inkjet-printer/mx-series/pixma-mx870
 	install = canon-pixma-mx870-complete.install
 	arch = i686
@@ -23,18 +23,18 @@ pkgbase = canon-pixma-mx870-complete
 	depends_i686 = libtiff4
 	depends_i686 = libxml2
 	depends_i686 = gtk2
-	optdepends_i686 = gtk-engines: nicer UI
-	optdepends_i686 = libcanberra: nicer UI
-	optdepends_i686 = at-spi2-atk: nicer UI
+	optdepends_i686 = gtk-engines: nicer ScanGear MP UI
+	optdepends_i686 = libcanberra: nicer ScanGear MP UI
+	optdepends_i686 = at-spi2-atk: nicer ScanGear MP UI
 	depends_x86_64 = lib32-popt
 	depends_x86_64 = lib32-libpng12
 	depends_x86_64 = lib32-libusb-compat
 	depends_x86_64 = lib32-libtiff4
 	depends_x86_64 = lib32-libxml2
 	depends_x86_64 = lib32-gtk2
-	optdepends_x86_64 = lib32-gtk-engines: nicer UI
-	optdepends_x86_64 = lib32-libcanberra: nicer UI
-	optdepends_x86_64 = lib32-at-spi2-atk: nicer UI
+	optdepends_x86_64 = lib32-gtk-engines: nicer ScanGear MP UI
+	optdepends_x86_64 = lib32-libcanberra: nicer ScanGear MP UI
+	optdepends_x86_64 = lib32-at-spi2-atk: nicer ScanGear MP UI
 
 pkgname = canon-pixma-mx870-complete
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b5164c77a73..be789068f8ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,63 +4,51 @@
  
 pkgname=canon-pixma-mx870-complete
 pkgver=3.30
-pkgrel=7
+pkgrel=8
 pkgdesc="Complete stand alone driver set (printing and scanning) for Canon Pixma MX870"
 url="https://www.usa.canon.com/internet/portal/us/home/support/details/printers/support-inkjet-printer/mx-series/pixma-mx870"
 arch=('i686' 'x86_64')
 license=('custom')
 depends_i686=('popt' 'libpng12' 'libusb-compat' 'libtiff4' 'libxml2' 'gtk2')
 depends_x86_64=('lib32-popt' 'lib32-libpng12' 'lib32-libusb-compat' 'lib32-libtiff4' 'lib32-libxml2' 'lib32-gtk2')
-optdepends_i686=('gtk-engines: nicer UI'
-		 'libcanberra: nicer UI'
-		 'at-spi2-atk: nicer UI')
-optdepends_x86_64=('lib32-gtk-engines: nicer UI'
-		   'lib32-libcanberra: nicer UI'
-		   'lib32-at-spi2-atk: nicer UI')
+optdepends_i686=('gtk-engines: nicer ScanGear MP UI'
+		 'libcanberra: nicer ScanGear MP UI'
+		 'at-spi2-atk: nicer ScanGear MP UI')
+optdepends_x86_64=('lib32-gtk-engines: nicer ScanGear MP UI'
+		   'lib32-libcanberra: nicer ScanGear MP UI'
+		   'lib32-at-spi2-atk: nicer ScanGear MP UI')
 options=('!strip' '!emptydirs')
 install="${pkgname}".install
-source=("https://gdlp01.c-wss.com/gds/3/0100002723/01/cnijfilter-mx870series-3.30-1-i386-deb.tar.gz"
+source=("https://gdlp01.c-wss.com/gds/3/0100002723/01/cnijfilter-mx870series-${pkgver}-1-i386-deb.tar.gz"
         "https://gdlp01.c-wss.com/gds/0/0100002730/01/scangearmp-mx870series-1.50-1-i386-deb.tar.gz"
-        "${pkgname}"-scangearmp.desktop
-        "${pkgname}"-scangearmp-icon.png)
+        "${pkgname}-scangearmp.desktop"
+        "${pkgname}-scangearmp-icon.png")
 sha256sums=('df3694f4cf60a63010a8a4fbefcb38195c895786a8edf3fc2dc452bea7b60a95'
             'ec70d28e830e927d7b05649e4102963dee08e579373cfab9e305f11399afa245'
             'b94e03193c2f78d26156f5e4c9bc7fb4451b708aded9ab46f9fc8faa3a40e406'
             '29dbc682d3f22d79f580bda54801d1f4ef261d857c756eaf4db29e1313406bcc')
 
 package() { 
-  # Custom variables
-  _canondir='cnijfilter-mx870series-3.30-1-i386-deb'
-  _scangearmpdir='scangearmp-mx870series-1.50-1-i386-deb'
-
-  # Get the .deb files
-  cd "${srcdir}"/"${_canondir}"/packages
-  find ./ -type f -iname '*.deb*' -exec install -m0644 "{}" "${pkgdir}"/"{}" \;
-  cd "${srcdir}"/"${_scangearmpdir}"/packages
-  find ./ -type f -iname '*.deb*' -exec install -m0644 "{}" "${pkgdir}"/"{}" \;
-
-  # Extract data from .deb archives
-  cd "${pkgdir}"
-  for _debfile in $(find ./ -type f -iname '*.deb*'); do
-	ar x "${_debfile}" data.tar.gz
-	tar -xvzf data.tar.gz
-	rm "${_debfile}"
-	rm data.tar.gz
+  # Extract and unpack data.tar.gz from the .deb files
+  cd "${srcdir}"
+  for _deb in $(find ./ -type f -name '*.deb'); do
+  	bsdtar -O -xf "${_deb}" data.tar.gz | bsdtar -C "${pkgdir}" -xJf -
   done
 
   # Fix udev rules
-  sed -i -e s/SYSFS/ATTR/g "${pkgdir}"/etc/udev/rules.d/80-canon_mfp.rules 
-  sed -i -e s/'MODE="666"'/'TAG+="uaccess", TAG+="udev-acl"'/g "${pkgdir}"/etc/udev/rules.d/80-canon_mfp.rules
-
-  # Licenses
-  cd "${pkgdir}"/usr/share/doc
-  find ./ -type f -exec install -Dm644 "{}" "${pkgdir}"/usr/share/licenses/"${pkgname}"/"{}" \;
+  sed -i -e s/SYSFS/ATTR/g "${pkgdir}/etc/udev/rules.d/80-canon_mfp.rules" 
+  sed -i -e s/'MODE="666"'/'TAG+="uaccess", TAG+="udev-acl"'/g "${pkgdir}/etc/udev/rules.d/80-canon_mfp.rules"
 
   # Clean up
-  chmod 0644 "${pkgdir}"/usr/lib/bjlib/canon_mfp_net.ini
-  chown root. "${pkgdir}"/usr/lib/bjlib/cnnet.ini
+  chmod 0644 "${pkgdir}/usr/lib/bjlib/canon_mfp_net.ini"
+  chown root. "${pkgdir}/usr/lib/bjlib/cnnet.ini"
+
+  # Install licenses
+  cd "${pkgdir}/usr/share/doc"
+  find ./ -type f -exec install -Dm644 "{}" "${pkgdir}/usr/share/licenses/${pkgname}/""{}" \;
 
-  # Install .desktop file and icon for scanner
-  install -Dm0644 "${srcdir}"/"${pkgname}"-scangearmp.desktop "${pkgdir}"/usr/share/applications/"${pkgname}"-scangearmp.desktop
-  install -Dm0644 "${srcdir}"/"${pkgname}"-scangearmp-icon.png "${pkgdir}"/usr/share/pixmaps/"${pkgname}"-scangearmp-icon.png
+  # Install .desktop file and scanner icon
+  cd "${srcdir}"
+  install -Dm0644 "${pkgname}-scangearmp.desktop" "${pkgdir}/usr/share/applications/${pkgname}-scangearmp.desktop"
+  install -Dm0644 "${pkgname}-scangearmp-icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}-scangearmp-icon.png"
 }
diff --git a/canon-pixma-mx870-complete.install b/canon-pixma-mx870-complete.install
index 67f142e9818c..d5f34c85f105 100644
--- a/canon-pixma-mx870-complete.install
+++ b/canon-pixma-mx870-complete.install
@@ -2,7 +2,6 @@
 
 post_install() {
 ## cnijfilter-mx870series section
-	gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 
 	CNIJ_PKG_INFO=cnijfilter-mx870-367
 
@@ -13,7 +12,7 @@ post_install() {
 	_cups_path2=/usr/share/cups/model
 	ppd_name=canon${model_name}.ppd
 
-	if [ -x /usr/bin/ldconfig ]; then
+	if [ -x /sbin/ldconfig ]; then
 		/sbin/ldconfig
 	fi
 
@@ -22,19 +21,12 @@ post_install() {
 		mkdir ${_cups_path2}
 	fi
 	ln -fs ${_cups_path1}/${ppd_name} ${_cups_path2}/${ppd_name}
-	update-desktop-database -q
-
 	
 ## scangearmp-common section
-	gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 
 	_gimp2dir1=/usr/lib32/gimp/2.0/plug-ins
 	_gimp2dir2=/usr/lib/gimp/2.0/plug-ins
 
-	if [ -x /usr/bin/ldconfig ]; then
-		/sbin/ldconfig
-	fi
-
 	# Make symbolic link for GIMP-plug-in
 	if [ -d ${_gimp2dir1} ]; then
 		ln -fs /usr/bin/scangearmp ${_gimp2dir1}/scangearmp
@@ -42,13 +34,6 @@ post_install() {
 		ln -fs /usr/bin/scangearmp ${_gimp2dir2}/scangearmp
 	fi
 
-	# Reload udev rules
-	if [ -x /usr/bin/udevadm ]; then
-		/sbin/udevadm control --reload-rules 2> /dev/null
-		/sbin/udevadm trigger --action=add --subsystem-match=usb 2> /dev/null
-	fi
-
-	update-desktop-database -q
 }
 
 post_upgrade() {
@@ -57,9 +42,10 @@ post_upgrade() {
 
 post_remove() {
 ## cnijfilter-common section
-	if [ -x /usr/bin/ldconfig ]; then
+
+	if [ -x /sbin/ldconfig ]; then
 		/sbin/ldconfig
-	fi
+        fi
 
 	# Remove cnbp* libs
 	for LIBS in libcnnet; do
@@ -73,7 +59,6 @@ post_remove() {
 
 
 ## cnijfilter-mx870series section
-	gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 
 	CNIJ_PKG_INFO=cnijfilter-mx870-367
 
@@ -83,10 +68,6 @@ post_remove() {
 	_cups_path2=/usr/share/cups/model
 	ppd_name=canon${model_name}.ppd
 
-	if [ -x /usr/bin/ldconfig ]; then
-		/sbin/ldconfig
-	fi
-
 	# Remove cnbp* libs
 	for LIBS in libcnbpcmcm libcnbpcnclapi libcnbpcnclbjcmd libcnbpcnclui libcnbpess libcnbpo; do
 		if [ -h /usr/lib/${LIBS}${model_num}.so ]; then
@@ -103,11 +84,9 @@ post_remove() {
 
 	# Remove symbolic link for ppd
 	unlink ${_cups_path2}/${ppd_name}
-	update-desktop-database -q
 
 	
 ## scangearmp-common section
-	gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 
 	_gimp2dir1=/usr/lib32/gimp/2.0/plug-ins
 	_gimp2dir2=/usr/lib/gimp/2.0/plug-ins
@@ -128,7 +107,6 @@ post_remove() {
 
 	# Remove sgmp_setting files
 	rm -f /tmp/canon_sgmp_setting*.*
-	update-desktop-database -q
 
 	
 ## scangearmp-mx870series section
@@ -136,10 +114,6 @@ post_remove() {
 
 	model_num=$(echo ${SCAN_PKG_INFO} | cut -d- -f3)
 
-	if [ -x /usr/bin/ldconfig ]; then
-		/sbin/ldconfig
-	fi
-
 	# Remove cncp* libs
 	for LIBS in libcncpmsimg libcncpmslld; do
 		if [ -h /usr/lib/${LIBS}${model_num}.so ]; then
@@ -150,11 +124,4 @@ post_remove() {
 		fi	
 	done
 
-	# Remove .desktop file and icon
-	if [ -f /usr/share/applications/canon-pixma-mx870-complete-scangearmp.desktop ]; then
-		rm -f /usr/share/applications/canon-pixma-mx870-complete-scangearmp.desktop
-	fi
-	if [ -f /usr/share/pixmaps/canon-pixma-mx870-complete-scangearmp-icon.png ]; then
-		rm -f /usr/share/pixmaps/canon-pixma-mx870-complete-scangearmp-icon.png
-	fi
 }