summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorrunnytu2020-06-15 20:39:21 +0200
committerrunnytu2020-06-15 20:39:21 +0200
commitb6bbfeefa478b3ea5da5c3b3a1b913521a3efb41 (patch)
tree12af9b612ec02a6e76051ab78347743c4a29750d
parenta292bb69b735e7b91f3134c6971caf796023bf69 (diff)
downloadaur-b6bbfeefa478b3ea5da5c3b3a1b913521a3efb41.tar.gz
Update sh script
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--packettracer.sh9
3 files changed, 12 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f379305f3aa..34dd61d85009 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = packettracer
pkgdesc = Cisco PacketTracer 7.3.0 installation package
pkgver = 7.3.0
- pkgrel = 5
+ pkgrel = 6
url = https://www.netacad.com/courses/packet-tracer
install = packettracer.install
arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = packettracer
source = local://PacketTracer_730_amd64.deb
source = packettracer.sh
sha512sums = b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1
- sha512sums = 74b90fc9f9e37b9d69bff1d43b97589563331b4dbbd89002447ad09d4454466321998cb0bbaeba478603c1038ef5be74b797c1a122dbb13150f8abdce174782c
+ sha512sums = 09d07ec95712f562bb9217b40a0a04cbb16e42523801b62180050326d67d3592f2ce92444440a10a6e94951c6cf53e27fb360395ef5f3732c71edc51e6a85726
depends = openssl-1.0
depends = dbus
depends = icu
diff --git a/PKGBUILD b/PKGBUILD
index 49495d712470..08ec69b00ce5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=packettracer
pkgver=7.3.0
-pkgrel=5
+pkgrel=6
pkgdesc="Cisco PacketTracer 7.3.0 installation package"
arch=( 'x86_64' )
depends=('openssl-1.0' 'dbus' 'icu' 'glib2' 'libxml2' 'libjpeg-turbo' 'nss')
@@ -19,7 +19,7 @@ license=('custom')
source=('local://PacketTracer_730_amd64.deb'
'packettracer.sh')
sha512sums=('b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1'
- '74b90fc9f9e37b9d69bff1d43b97589563331b4dbbd89002447ad09d4454466321998cb0bbaeba478603c1038ef5be74b797c1a122dbb13150f8abdce174782c')
+ '09d07ec95712f562bb9217b40a0a04cbb16e42523801b62180050326d67d3592f2ce92444440a10a6e94951c6cf53e27fb360395ef5f3732c71edc51e6a85726')
package() {
diff --git a/packettracer.sh b/packettracer.sh
index af3ebc8b0570..e7c206074981 100644
--- a/packettracer.sh
+++ b/packettracer.sh
@@ -1,7 +1,14 @@
+#!/bin/bash
+
PT7HOME=/opt/packettracer/
export PT7HOME
-if QT_VERSION > QT_VERSION_CHECK(5, 5, 0)
+function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
+
+QT_VERSION=`qmake -v | grep "Using Qt version" | sed -r 's/.* ([0-9]+\.*[0-9]+\.*[0-9]*).*?/\1/'`
+QT_VERSION_CHECK="5.5.0"
+
+if version_gt $QT_VERSION $QT_VERSION_CHECK;then
QT_AUTO_SCREEN_SCALE_FACTOR=1
export QT_AUTO_SCREEN_SCALE_FACTOR
else