Fix install file

4 files changed, 26 insertions, 170 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 330580fd1bf7..f5657836be4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = packettracer
 	pkgdesc = Cisco PacketTracer 7.3.0 installation package
 	pkgver = 7.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.netacad.com/courses/packet-tracer
 	install = packettracer.install
 	arch = x86_64
@@ -9,7 +9,9 @@ pkgbase = packettracer
 	options = !strip
 	options = !emptydirs
 	source = local://PacketTracer_730_amd64.deb
+	source = packettracer.sh
 	sha512sums = b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1
+	sha512sums = 156579687c5eb63ef2065b28625d9faeee96d2224248c6883a92264f5c0e800c5ab9206ad4c6afebb9dcdbe6b880a9a24caf96044a7c97df743473933fcd2c4d
 	depends = openssl-1.0
 	depends = libpng12
 	depends = icu
diff --git a/PKGBUILD b/PKGBUILD
index 0647bd32ebc8..94a9bd3c6ca8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,17 +7,19 @@
 
 pkgname=packettracer
 pkgver=7.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cisco PacketTracer 7.3.0 installation package"
 arch=( 'x86_64' )
 depends=('openssl-1.0' 'libpng12' 'icu')
-install=${pkgname}.install
 options=('!strip' '!emptydirs')
 url="https://www.netacad.com/courses/packet-tracer"
+install=${pkgname}.install
 license=('custom')
 
-source=('local://PacketTracer_730_amd64.deb')
-sha512sums=('b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1')
+source=('local://PacketTracer_730_amd64.deb'
+	'packettracer.sh')
+sha512sums=('b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1'
+	    '156579687c5eb63ef2065b28625d9faeee96d2224248c6883a92264f5c0e800c5ab9206ad4c6afebb9dcdbe6b880a9a24caf96044a7c97df743473933fcd2c4d')
 
 package() {
 
@@ -25,6 +27,9 @@ package() {
 
 	mv ${pkgdir}/opt/pt/ ${pkgdir}/opt/packettracer/
 
+	mkdir -p "${pkgdir}/usr/bin/"
+	ln -s ${pkgdir}/opt/packettracer "${pkgdir}/usr/bin/packettracer"
+
 	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"
@@ -32,6 +37,8 @@ package() {
 	rm "${pkgdir}/usr/share/applications/cisco-ptsa7.desktop"
 	sed -e "\$aCategories=Application;Network;" -i "${pkgdir}/usr/share/applications/cisco-pt7.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"
 	install -D -m644 "${pkgdir}/opt/packettracer/eula730.txt" "${pkgdir}/usr/share/licenses/${pkgname}/EULA"
diff --git a/packettracer.install b/packettracer.install
index 3369d3397fac..85f768a4b658 100644
--- a/packettracer.install
+++ b/packettracer.install
@@ -1,174 +1,17 @@
-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
+if [ ! -f "/usr/lib/libdouble-conversion.so.1" ]; then
+	if [ ! -f "/opt/packettracer/bin/libdouble-conversion.so.1" ]; then
+	ln -s /usr/lib/libdouble-conversion.so /opt/packettracer/bin/libdouble-conversion.so.1
 	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
+fi
 }
 
 post_upgrade() {
-	post_install
+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
+if [ -f "/opt/packettracer/bin/libdouble-conversion.so.1" ]; then
+    rm /opt/packettracer/bin/libdouble-conversion.so.1
+fi
 }
diff --git a/packettracer.sh b/packettracer.sh
new file mode 100644
index 000000000000..a1ad3b9ec8cd
--- /dev/null
+++ b/packettracer.sh
@@ -0,0 +1,4 @@
+PT7HOME=/opt/packettracer/
+export PT7HOME
+QT_DEVICE_PIXEL_RATIO=auto
+export QT_DEVICE_PIXEL_RATIO