Tidy up PKGBUILD

3 files changed, 20 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bb37ca95f2f..49dbcf57823c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,16 @@
 pkgbase = packettracer
-	pkgdesc = Cisco PacketTracer 8.0 installation package
+	pkgdesc = A cross-platform visual simulation tool designed by Cisco Systems that allows users to create network topologies and imitate modern computer network
 	pkgver = 8.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.netacad.com/courses/packet-tracer
-	install = packettracer.install
 	arch = x86_64
 	license = custom
 	options = !strip
 	options = !emptydirs
 	source = local://PacketTracer_800_amd64_build212_final.deb
 	source = packettracer.sh
-	source = packettracer.install
 	sha512sums = 3a56a369ae2028fa866ad2e27bbe07d1bee14fd0f16f82790c5f7ad9b7a7c3fc39b4b88d52aae652dccf1a21a3ae0f433e8b586ace4f48dfab7271524c5d163c
 	sha512sums = 3246843441207d66ccffd0717aa85a7bf828842c2c337d1527597bdf57cc2f9966c75c764aa22f9cb6a331e6268dd64af0da7ce4cc89725d418fc54e163230f2
-	sha512sums = c0e894ff34e5e635574edcca9cd06dddc1706deef82032a964f779c1ac734e41ba328287ee7a8c989b9c4baf6a517e4d482465803f8f2dabd691616bf972cb7a
 	depends = openssl>=1.0
 	depends = dbus
 	depends = icu
@@ -22,6 +19,7 @@ pkgbase = packettracer
 	depends = libjpeg-turbo
 	depends = nss
 	depends = libxss
+	depends = java-runtime>=1.7.0
 
 pkgname = packettracer
 
diff --git a/PKGBUILD b/PKGBUILD
index a302372dfa90..6a5b9d69ca2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,44 +7,44 @@
 
 pkgname=packettracer
 pkgver=8.0
-pkgrel=1
-pkgdesc="Cisco PacketTracer 8.0 installation package"
+pkgrel=2
+pkgdesc="A cross-platform visual simulation tool designed by Cisco Systems that allows users to create network topologies and imitate modern computer network"
 arch=( 'x86_64' )
-depends=('openssl>=1.0' 'dbus' 'icu' 'glib2' 'libxml2' 'libjpeg-turbo' 'nss' 'libxss')
+depends=('openssl>=1.0' 'dbus' 'icu' 'glib2' 'libxml2' 'libjpeg-turbo' 'nss' 'libxss' 'java-runtime>=1.7.0')
 options=('!strip' '!emptydirs')
 url="https://www.netacad.com/courses/packet-tracer"
-install=${pkgname}.install
 license=('custom')
 
 source=('local://PacketTracer_800_amd64_build212_final.deb'
-	'packettracer.sh'
-	'packettracer.install')
+	'packettracer.sh')
 sha512sums=('3a56a369ae2028fa866ad2e27bbe07d1bee14fd0f16f82790c5f7ad9b7a7c3fc39b4b88d52aae652dccf1a21a3ae0f433e8b586ace4f48dfab7271524c5d163c'
-	    '3246843441207d66ccffd0717aa85a7bf828842c2c337d1527597bdf57cc2f9966c75c764aa22f9cb6a331e6268dd64af0da7ce4cc89725d418fc54e163230f2'
-	    'c0e894ff34e5e635574edcca9cd06dddc1706deef82032a964f779c1ac734e41ba328287ee7a8c989b9c4baf6a517e4d482465803f8f2dabd691616bf972cb7a')
+	    '3246843441207d66ccffd0717aa85a7bf828842c2c337d1527597bdf57cc2f9966c75c764aa22f9cb6a331e6268dd64af0da7ce4cc89725d418fc54e163230f2')
 
 package() {
 
 	tar xf data.tar.xz -C "${pkgdir}"
 	chown -R 0:0 ${pkgdir}
 	mv ${pkgdir}/opt/pt/ ${pkgdir}/opt/packettracer/
-
 	mkdir -p "${pkgdir}/usr/bin/"
+
+	find "${pkgdir}" -type d -exec chmod 755 {} \;
+	find "${pkgdir}/opt/packettracer/help/" -type d -exec chmod 777 {} \;
+	find "${pkgdir}/opt/packettracer/saves/" -type d -exec chmod 555 {} \;
+	find "${pkgdir}/opt/packettracer/art/html/network_controller/" -type d -exec chmod 775 {} \;
+	find "${pkgdir}/opt/packettracer/art/RackView/CablePegboard/" -type d -exec chmod 775 {} \;
+	find "${pkgdir}/opt/packettracer/bin/xcbglintegrations/" -type d -exec chmod 775 {} \;
+	find "${pkgdir}/opt/packettracer/help/default/NetconRestAPI/" -type d -exec chmod 775 {} \;
+	
 	ln -s /opt/packettracer/packettracer "${pkgdir}/usr/bin/packettracer"
 
 	ln -s /usr/lib/libdouble-conversion.so "${pkgdir}/opt/packettracer/bin/libdouble-conversion.so.1"
 
-	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/opt/packettracer/linguist"
-	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/opt/packettracer/packettracer"
-	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/usr/share/applications/cisco-pt.desktop"
-	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/usr/share/applications/cisco-ptsa.desktop"
-	sed -e "\$aCategories=Application;Network;" -i "${pkgdir}/usr/share/applications/cisco-pt.desktop"
-	sed -e "\$aCategories=Application;Network;" -i "${pkgdir}/usr/share/applications/cisco-ptsa.desktop"
-	sed -e "\$aNoDisplay=true" -i "${pkgdir}/usr/share/applications/cisco-ptsa.desktop"
+	sed -i 's|/opt/pt|/opt/packettracer|' "${pkgdir}/opt/packettracer/linguist" "${pkgdir}/opt/packettracer/packettracer" "${pkgdir}/usr/share/applications/cisco-pt.desktop" "${pkgdir}/usr/share/applications/cisco-ptsa.desktop"
+
+	sed -i -e "\$aCategories=Network;" "${pkgdir}/usr/share/applications/cisco-pt.desktop" "${pkgdir}/usr/share/applications/cisco-ptsa.desktop"
 
 	install -D -m755 "${srcdir}/packettracer.sh" "${pkgdir}/etc/profile.d/packettracer.sh"
 
-	install -D -m644 "${pkgdir}/opt/packettracer/saves/Switch/IE_2000/upgrade_downgrade_license_on_ie2000.pkt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -D -m644 "${pkgdir}/opt/packettracer/help/default/copyrights.htm" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
 
 }
diff --git a/packettracer.install b/packettracer.install
deleted file mode 100644
index c938d3ede81f..000000000000
--- a/packettracer.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	xdg-desktop-menu install /usr/share/applications/cisco-pt.desktop
-	xdg-desktop-menu install /usr/share/applications/cisco-ptsa.desktop
-	update-mime-database /usr/share/mime
-	gtk-update-icon-cache --force /usr/share/icons/gnome
-}
-
-post_upgrade() {
-	post_remove
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	xdg-desktop-menu uninstall /usr/share/applications/cisco-pt*
-	update-mime-database /usr/share/mime
-	gtk-update-icon-cache --force /usr/share/icons/gnome
-}
-