PKGBUILD cleaned, user noticed to accept the license when installing or upgrading

3 files changed, 75 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d092ee3bfe9..87f32de2076d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
 pkgbase = forticlientsslvpn
-	pkgdesc = Fortinet SSL VPN Client for linux
+	pkgdesc = Fortinet's SSLVPN Client for linux
 	pkgver = 4.4.2331
-	pkgrel = 1
-	epoch = 1
+	pkgrel = 2
 	url = https://support.fortinet.com
+	install = forticlientsslvpn.install
 	arch = i686
 	arch = x86_64
-	license = custom
-	depends = ppp
-	depends = net-tools
-	depends = libsm
+	license = custom:FortiClientSSLVPN
 	depends = gtk2
+	depends = libsm
+	depends = net-tools
+	depends = ppp
 	optdepends = gtk-engines: for gtk theme support
 	optdepends = gnome-themes-standard: for theming
 	source = https://github.com/mcereda/forticlientsslvpn/raw/master/tarball/forticlientsslvpn_linux_4.4.2331.tar.gz
-	source = forticlientsslvpn.sh
-	source = forticlientsslvpn_cli.sh
 	source = forticlientsslvpn.desktop
 	source = forticlientsslvpn.png
+	source = forticlientsslvpn.sh
+	source = forticlientsslvpn_cli.sh
 	sha256sums = c0affee5516d6426cf5bc7ac1f0d1c158fef02cb377817d4c5a917acab1b62bd
-	sha256sums = 5d4737629cadf38194ffc68d927a202cbac5f9fbcf825f11407c00e6a15842fb
-	sha256sums = 92f0dcc5431221d6832220b3ddec8d9606fff9ded4f8590eabd1c9ff3e37cb8b
 	sha256sums = 4f63f4503dca7633a4d7a1cf874ede1f33f877a701813349c5cd63889151f4a2
 	sha256sums = 15d46db76a39f32736ee3a469fc1b821e6290453c701af823875a493d06901df
+	sha256sums = 5d4737629cadf38194ffc68d927a202cbac5f9fbcf825f11407c00e6a15842fb
+	sha256sums = 92f0dcc5431221d6832220b3ddec8d9606fff9ded4f8590eabd1c9ff3e37cb8b
 
 pkgname = forticlientsslvpn
 
diff --git a/PKGBUILD b/PKGBUILD
index 84c3dbd52437..2ceac775b4d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,67 @@
 # Maintainer: Michele Cereda <cereda.michele@gmail.com>
 # Contributor: JokerYu <dayushinn@gmail.com>, Olivier Bilodeau <obilodeau@gosecure.ca>
-pkgname=forticlientsslvpn
-pkgver=4.4.2331
-pkgrel=1
-epoch=1
-pkgdesc="Fortinet SSL VPN Client for linux"
-arch=("i686" "x86_64")
-url="https://support.fortinet.com"
-license=("custom")
-depends=("ppp" "net-tools" "libsm" "gtk2")
-optdepends=("gtk-engines: for gtk theme support" "gnome-themes-standard: for theming")
 
-_sourceName=${pkgname}_linux_${pkgver}.tar.gz
-
-if [ "$CARCH" = "i686" ]; then
-  _arch=32bit
-elif [ "$CARCH" = "x86_64" ]; then
-  _arch=64bit
-fi
+pkgname="forticlientsslvpn"
+pkgver="4.4.2331"
+pkgrel="2"
+pkgdesc="Fortinet's SSLVPN Client for linux"
+arch=("i686" "x86_64")
+install="${pkgname}.install"
 
-sha256sums=('c0affee5516d6426cf5bc7ac1f0d1c158fef02cb377817d4c5a917acab1b62bd'
-            '5d4737629cadf38194ffc68d927a202cbac5f9fbcf825f11407c00e6a15842fb'
-            '92f0dcc5431221d6832220b3ddec8d9606fff9ded4f8590eabd1c9ff3e37cb8b'
-            '4f63f4503dca7633a4d7a1cf874ede1f33f877a701813349c5cd63889151f4a2'
-            '15d46db76a39f32736ee3a469fc1b821e6290453c701af823875a493d06901df')
+url="https://support.fortinet.com"
+license=("custom:FortiClientSSLVPN")
 
-_tarballsrc="https://github.com/mcereda/forticlientsslvpn/raw/master/tarball/${_sourceName}"  # Fortinet does not permit to download it directly
+depends=(
+	"gtk2"
+	"libsm"
+	"net-tools"
+	"ppp"
+)
+optdepends=(
+	"gtk-engines: for gtk theme support"
+	"gnome-themes-standard: for theming"
+)
 
 source=(
-  "${_tarballsrc}"
-  "${pkgname}.sh"
-  "${pkgname}_cli.sh"
-  "${pkgname}.desktop"
-  "${pkgname}.png"
+	"https://github.com/mcereda/forticlientsslvpn/raw/master/tarball/${pkgname}_linux_${pkgver}.tar.gz"
+	"${pkgname}.desktop"
+	"${pkgname}.png"
+	"${pkgname}.sh"
+	"${pkgname}_cli.sh"
+)
+sha256sums=(
+	"c0affee5516d6426cf5bc7ac1f0d1c158fef02cb377817d4c5a917acab1b62bd"
+	"4f63f4503dca7633a4d7a1cf874ede1f33f877a701813349c5cd63889151f4a2"
+	"15d46db76a39f32736ee3a469fc1b821e6290453c701af823875a493d06901df"
+	"5d4737629cadf38194ffc68d927a202cbac5f9fbcf825f11407c00e6a15842fb"
+	"92f0dcc5431221d6832220b3ddec8d9606fff9ded4f8590eabd1c9ff3e37cb8b"
 )
 
-package() {
-  _srcpath=${srcdir}/${pkgname}/${_arch}
-
-  cd ${_srcpath}/helper
 
-  msg "creating path and copying files..."
+if   [ "$CARCH" = "i686"   ]; then _arch="32bit"
+elif [ "$CARCH" = "x86_64" ]; then _arch="64bit"
+fi
 
-  mkdir -p ${pkgdir}/opt/fortinet/${pkgname}/icons
-  mkdir -p ${pkgdir}/usr/bin
-  mkdir -p ${pkgdir}/usr/share/applications
-  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
+package() {
+	msg "Creating folders..."
+	mkdir -p ${pkgdir}/opt/fortinet/${pkgname}/icons
+	mkdir -p ${pkgdir}/usr/bin
+	mkdir -p ${pkgdir}/usr/share/applications
+	mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
 
-  cp -rp ${_srcpath}/* ${pkgdir}/opt/fortinet/${pkgname}
+	msg "Copying files..."
+	cp -rp ${srcdir}/${pkgname}/${_arch}/* ${pkgdir}/opt/fortinet/${pkgname}
 
-  chmod 555 ${pkgdir}/opt/fortinet/${pkgname}/helper
+	msg "Setting acceptable permissions..."
+	chmod 555 ${pkgdir}/opt/fortinet/${pkgname}/helper
 
-  install -Dm 644 ${srcdir}/${pkgname}.png ${pkgdir}/opt/fortinet/${pkgname}/icons/
-  install -Dm 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/
-  install -Dm 644 ${_srcpath}/helper/License.txt ${pkgdir}/usr/share/licenses/${pkgname}/
-  install -Dm 755 ${srcdir}/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
-  install -Dm 755 ${srcdir}/${pkgname}_cli.sh ${pkgdir}/usr/bin/${pkgname}_cli
+	msg "Installing files..."
+	install -Dm 644 ${srcdir}/${pkgname}.png ${pkgdir}/opt/fortinet/${pkgname}/icons/
+	install -Dm 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/
+	install -Dm 644 ${srcdir}/${pkgname}/${_arch}/helper/License.txt ${pkgdir}/usr/share/licenses/${pkgname}/
+	
+	msg "Installing launchers"
+	# needed by the program since it checks that the executable is launched from /opt/fortinet/forticlientsslvpn/
+	install -Dm 755 ${srcdir}/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
+	install -Dm 755 ${srcdir}/${pkgname}_cli.sh ${pkgdir}/usr/bin/${pkgname}_cli
 }
diff --git a/forticlientsslvpn.install b/forticlientsslvpn.install
new file mode 100644
index 000000000000..0168b454798f
--- /dev/null
+++ b/forticlientsslvpn.install
@@ -0,0 +1,12 @@
+post_install() {
+	# remember the user to accept the license before use
+	# the program will not run otherwise
+	echo -e "\nPlease remember to accept the license\nYou can do it running /opt/fortinet/forticlientsslvpn/helper/setup.linux.sh as root\n"
+}
+
+post_upgrade() {
+        # remember the user to re-accept the license before use
+        # the program will not run otherwise
+        echo -e "\nPlease remember to re-accept the license\nYou can do it running /opt/fortinet/forticlientsslvpn/helper/setup.linux.sh as root again\n"
+}
+