Update to 7.3.0

7 files changed, 199 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34c7fa00c057..330580fd1bf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = packettracer
-	pkgdesc = Network design and emulation software for Cisco's Networking Academy instructors and students.
-	pkgver = 7.2.1
+	pkgdesc = Cisco PacketTracer 7.3.0 installation package
+	pkgver = 7.3.0
 	pkgrel = 1
-	url = http://www.netacad.com/about-networking-academy/packet-tracer
-	install = pt.install
+	url = https://www.netacad.com/courses/packet-tracer
+	install = packettracer.install
 	arch = x86_64
 	license = custom
 	options = !strip
-	source = packettracer
-	source = linguist
-	source = packettracer.sh
-	source = local://Packet Tracer 7.2.1 for Linux 64 bit.tar.gz
-	sha512sums = dcfe03ce9594b83963d87a8e79d641745d9b8c6b39dfbec328c17035e2fd1d5b1fa494b2d988c901e0b5d25bc04a601c442a08c7abaec57100c1133e0ac9d228
-	sha512sums = 1007b2d5268fe252a8f5395bf8a297d8d0d0f37ef74c793021183ba186d2c794e6ab0f3c16dff549a38ddc3446aea7ae7504534e407dd0aee76c5c43301843fb
-	sha512sums = dcab77daefe69638fe97e9326b1e107f072a582f58c70fcd04d1590a729fdce7a5041b5b173754f9fc9e055fb22614bea67639cb164fd4e00778d1bb57853499
-	sha512sums = 359f1b2740459cf58b2e71da3edd52eb8c49c3197c3a5af25682e469c00e8e35de90b2d43cdd8d9c614cbed0aac554b150d578d6a25295ea547025e090b4ff25
+	options = !emptydirs
+	source = local://PacketTracer_730_amd64.deb
+	sha512sums = b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1
 	depends = openssl-1.0
 	depends = libpng12
 	depends = icu
diff --git a/PKGBUILD b/PKGBUILD
index 0a505b79a1f2..0647bd32ebc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,75 +6,34 @@
 # Contributor: z3ntu <WEI16416@spengergasse.at>
 
 pkgname=packettracer
-pkgver=7.2.1
+pkgver=7.3.0
 pkgrel=1
-pkgdesc="Network design and emulation software for Cisco's Networking Academy instructors and students."
+pkgdesc="Cisco PacketTracer 7.3.0 installation package"
 arch=( 'x86_64' )
 depends=('openssl-1.0' 'libpng12' 'icu')
-url="http://www.netacad.com/about-networking-academy/packet-tracer"
+install=${pkgname}.install
+options=('!strip' '!emptydirs')
+url="https://www.netacad.com/courses/packet-tracer"
 license=('custom')
 
-source=('packettracer' 'linguist' 'packettracer.sh' 'local://Packet Tracer 7.2.1 for Linux 64 bit.tar.gz')
-sha512sums=('dcfe03ce9594b83963d87a8e79d641745d9b8c6b39dfbec328c17035e2fd1d5b1fa494b2d988c901e0b5d25bc04a601c442a08c7abaec57100c1133e0ac9d228'
-	    '1007b2d5268fe252a8f5395bf8a297d8d0d0f37ef74c793021183ba186d2c794e6ab0f3c16dff549a38ddc3446aea7ae7504534e407dd0aee76c5c43301843fb'
-	    'dcab77daefe69638fe97e9326b1e107f072a582f58c70fcd04d1590a729fdce7a5041b5b173754f9fc9e055fb22614bea67639cb164fd4e00778d1bb57853499'
-	    '359f1b2740459cf58b2e71da3edd52eb8c49c3197c3a5af25682e469c00e8e35de90b2d43cdd8d9c614cbed0aac554b150d578d6a25295ea547025e090b4ff25')
-
-# We don't want to strip anything from the static libraries
-# We want to keep all binaries orginal (Cisco is goofy)
-options=(!strip)
-install=pt.install
+source=('local://PacketTracer_730_amd64.deb')
+sha512sums=('b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1')
 
 package() {
-  cd "${srcdir}/"
-
-  mkdir -p "${pkgdir}/opt/packettracer/"{art,backgrounds,bin,extensions,help,languages,saves,Sounds,templates}
-
-  cp -r ./art/* "${pkgdir}/opt/packettracer/art"
-  cp -r ./backgrounds/* "${pkgdir}/opt/packettracer/backgrounds"
-  cp -r ./bin/* "${pkgdir}/opt/packettracer/bin"
-  cp -r ./extensions/* "${pkgdir}/opt/packettracer/extensions"
-  cp -r ./languages/* "${pkgdir}/opt/packettracer/languages"
-  cp -r ./saves/* "${pkgdir}/opt/packettracer/saves"
-  cp -r ./Sounds/* "${pkgdir}/opt/packettracer/Sounds"
-  cp -r ./templates/* "${pkgdir}/opt/packettracer/templates"
-
-  # Help Files that are optinal uncomment to include them (55 MB)
-  # cp -r ./help/* "${pkgdir}/opt/packettracer/help"
-
-  # Mime Info for PKA, PKT, PKZ
-  install -D -m644 ./bin/Cisco-pka.xml "${pkgdir}/usr/share/mime/packages/Cisco-pka.xml"
-  install -D -m644 ./bin/Cisco-pkt.xml "${pkgdir}/usr/share/mime/packages/Cisco-pkt.xml"
-  install -D -m644 ./bin/Cisco-pkz.xml "${pkgdir}/usr/share/mime/packages/Cisco-pkz.xml"
-
-  rm "${pkgdir}/opt/packettracer/bin/Cisco-pka.xml"
-  rm "${pkgdir}/opt/packettracer/bin/Cisco-pkt.xml"
-  rm "${pkgdir}/opt/packettracer/bin/Cisco-pkz.xml"
-
-  # Install Mimetype Icons
-  install -D -m644 ./art/pka.png "${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/application-x-pka.png"
-  install -D -m644 ./art/pkt.png "${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/application-x-pkt.png"
-  install -D -m644 ./art/pkz.png "${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/application-x-pkz.png"
-
-  # EULA
-  install -D -m644 eula721.txt "${pkgdir}/usr/share/licenses/$pkgname/eula721.txt"
 
-  # Shell script to start PT and tell it to use included qt files
-  # Arch's QT causes PT to crash when saving!
-  install -D -m755 "${srcdir}/packettracer" "${pkgdir}/opt/packettracer/packettracer"
+	tar xf data.tar.xz -C "${pkgdir}"
 
-  # Symlink to /usr/bin
-  mkdir -p "${pkgdir}/usr/bin/"
-  ln -s /opt/packettracer/packettracer "${pkgdir}/usr/bin/packettracer"
+	mv ${pkgdir}/opt/pt/ ${pkgdir}/opt/packettracer/
 
-  # Improved version of Cisco's linguist script
-  install -D -m755 "${srcdir}/linguist" "${pkgdir}/opt/packettracer/linguist"
+	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}/opt/packettracer/bin/Cisco-PacketTracer.desktop"
+	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/usr/share/applications/cisco-pt7.desktop"
+	rm "${pkgdir}/usr/share/applications/cisco-ptsa7.desktop"
+	sed -e "\$aCategories=Application;Network;" -i "${pkgdir}/usr/share/applications/cisco-pt7.desktop"
 
-  # Add enviroment variable
-  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"
+	install -D -m644 "${pkgdir}/opt/packettracer/eula730.txt" "${pkgdir}/usr/share/licenses/${pkgname}/EULA"
 
-  # Desktop File
-  install -D -m644 ./bin/Cisco-PacketTracer.desktop "${pkgdir}/usr/share/applications/Cisco-PacketTracer.desktop"
-  sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/usr/share/applications/Cisco-PacketTracer.desktop"
-  rm "${pkgdir}/opt/packettracer/bin/Cisco-PacketTracer.desktop"
 }
diff --git a/linguist b/linguist
deleted file mode 100755
index 6601f570bc3e..000000000000
--- a/linguist
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# As for now, PacketTracer works with built-in arch libraries
-# If you exprerience any troubles, try to uncomment
-# the following line        
-
-export LD_LIBRARY_PATH="/opt/packettracer/bin" 
-
-/opt/packettracer/bin/linguist "$@"
-
diff --git a/packettracer b/packettracer
deleted file mode 100755
index 181a55af73fe..000000000000
--- a/packettracer
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Modified and improved version of Cisco's Script
-
-# As for now, PacketTracer works with built-in arch libraries
-# If you exprerience any troubles, try to uncomment
-# the following line
-
-export LD_LIBRARY_PATH="/opt/packettracer/bin"
-
-exec /opt/packettracer/bin/PacketTracer7 "$@"
-
diff --git a/packettracer.install b/packettracer.install
new file mode 100644
index 000000000000..3369d3397fac
--- /dev/null
+++ b/packettracer.install
@@ -0,0 +1,174 @@
+pre_install() {
+	remove_pt ()
+	{
+	if [ -e /opt/pt ]; then
+	  echo "Removing old version of Packet Tracer from /opt/pt"
+	  sudo rm -rf /opt/pt
+	  sudo rm -rf /usr/share/applications/cisco-pt7.desktop
+	  sudo rm -rf /usr/share/applications/cisco-ptsa7.desktop
+	  sudo rm -rf /usr/share/icons/hicolor/48x48/apps/pt7.png
+	fi
+	if [ -e /opt/packettracer/ ]; then
+	  echo "Removing old version of Packet Tracer from /opt/packettracer/"
+	  sudo rm -rf /opt/packettracer/
+	  sudo rm -rf /usr/share/applications/cisco-pt7.desktop
+	  sudo rm -rf /usr/share/applications/cisco-ptsa7.desktop
+	  sudo rm -rf /usr/share/icons/hicolor/48x48/apps/pt7.png
+	fi
+	}
+}
+
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	# update icon and file assocation
+	sudo xdg-desktop-menu install /usr/share/applications/cisco-pt7.desktop
+	sudo update-mime-database /usr/share/mime
+	sudo gtk-update-icon-cache --force /usr/share/icons/gnome
+
+	# sets the incoming PTDIR as a system environment variable
+	# sets the Qt high resolution as a system environment variable
+	# by modifying /etc/profile 
+	PTDIR="/opt/packettracer/"
+
+	# create shortcut
+	sudo ln -sf $PTDIR/packettracer /usr/bin/packettracer
+
+	# check /etc/profile for existance of PT7HOME
+	PROFILE="/etc/profile" 
+
+	# error exit if file does not exist or unreadable
+	if [ ! -f $PROFILE ]; then
+	   exit 1
+	elif [ ! -r $PROFILE ]; then
+	   exit 2
+	fi
+
+	# read contents
+	CONTENTS=""
+	EXPORT_EXISTS=0
+	PT7HOME_EXISTS=0
+	PT7HOME_FOUND=0
+	EXPORT_QT_EXISTS=0
+	QT_EXISTS=0
+	QT_FOUND=0
+	exec 3<&0
+	exec 0<$PROFILE
+	while IFS= read -r line
+	do
+
+	  # replace existing entries
+	  PT7HOME_FOUND=$(expr match "$line" 'PT7HOME')
+	  if [ "$PT7HOME_FOUND" -gt 0 ]; then
+		line="PT7HOME=$PTDIR"
+	        PT7HOME_EXISTS=1
+	  fi
+
+	  QT_FOUND=$(expr match "$line" 'QT_DEVICE_PIXEL_RATIO')
+	  if [ "$QT_FOUND" -gt 0 ]; then
+		line="QT_DEVICE_PIXEL_RATIO=auto"
+	        QT_EXISTS=1
+	  fi
+
+	  # check for export statement
+	  if [ $EXPORT_EXISTS -eq 0 ]; then
+	      EXPORT_QT_EXISTS=$(expr match "$line" 'export QT_DEVICE_PIXEL_RATIO')
+	  fi
+
+	  if [ "$EXPORT_QT_EXISTS" -eq 0 ]; then
+	      EXPORT_QT_EXISTS=$(expr match "$line" 'export QT_DEVICE_PIXEL_RATIO')
+	  fi
+
+	  #append the line to the contents
+	  CONTENTS="$CONTENTS
+$line"
+	done
+	exec 0<&3
+
+	if [ $PT7HOME_EXISTS -eq 0 ]; then
+	  CONTENTS="$CONTENTS
+PT7HOME=$PTDIR"
+	fi
+
+	if [ $EXPORT_EXISTS -eq 0 ]; then
+	  CONTENTS="$CONTENTS
+export PT7HOME"
+	fi
+
+	if [ $QT_EXISTS -eq 0 ]; then
+	  CONTENTS="$CONTENTS
+QT_DEVICE_PIXEL_RATIO=auto"
+	fi
+
+	if [ $EXPORT_EXISTS -eq 0 ]; then
+	  CONTENTS="$CONTENTS
+export QT_DEVICE_PIXEL_RATIO"
+	fi
+
+	sudo echo -e "$CONTENTS" | sudo tee /etc/profile > /dev/null
+	sudo sed '1{/^$/d}' -i /etc/profile > /dev/null
+
+	update-desktop-database -q
+}
+
+pre_upgrade() {
+	pre_install
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	sudo xdg-desktop-menu uninstall /usr/share/applications/cisco-pt7.desktop
+	sudo xdg-desktop-menu uninstall /usr/share/applications/cisco-ptsa7.desktop
+	sudo update-mime-database /usr/share/mime
+	sudo gtk-update-icon-cache --force /usr/share/icons/gnome
+
+	sudo rm -f /usr/bin/packettracer
+
+	# check /etc/profile for existance of PT7HOME
+	PROFILE="/etc/profile" 
+
+	# error exit if file does not exist or unreadable
+	if [ ! -f $PROFILE ]; then
+	true
+	elif [ ! -r $PROFILE ]; then
+	true
+	fi
+
+	# read contents
+	exec 3<&0
+	exec 0<$PROFILE
+	while IFS= read -r line
+	do
+	  PT7HOME_FOUND=$(expr match "$line" 'PT7HOME')
+	  if [ "$PT7HOME_FOUND" -gt 0 ]; then
+		continue
+	  fi
+
+	  QT_FOUND=$(expr match "$line" 'QT_DEVICE_PIXEL_RATIO')
+	  if [ "$QT_FOUND" -gt 0 ]; then
+		continue
+	  fi
+
+	  EXPORT_FOUND=$(expr match "$line" 'export PT7HOME')
+	  if [ "$EXPORT_FOUND" -gt 0 ]; then
+		continue
+	  fi
+
+	  EXPORT_QT_FOUND=$(expr match "$line" 'export QT_DEVICE_PIXEL_RATIO')
+	  if [ "$EXPORT_QT_FOUND" -gt 0 ]; then
+		continue
+	  fi
+
+	  CONTENTS="$CONTENTS
+$line"
+	done
+	exec 0<&3
+
+	sudo echo -e "$CONTENTS" | sudo tee /etc/profile > /dev/null
+	sudo sed '1{/^$/d}' -i /etc/profile > /dev/null
+
+	update-desktop-database -q
+}
diff --git a/packettracer.sh b/packettracer.sh
deleted file mode 100755
index 398cec888f7e..000000000000
--- a/packettracer.sh
+++ /dev/null
@@ -1 +0,0 @@
-export PT_HOME=/opt/packettracer
diff --git a/pt.install b/pt.install
deleted file mode 100644
index 431261c58a1f..000000000000
--- a/pt.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-  echo "### NOTICE ###"
-  echo "Please read the EULA at /usr/share/licenses/packettracer/eula721.txt and uninstall if you do not agree."
-}
-