update download urls

2 files changed, 23 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05fa4c0a74c7..3e56f9dd22e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = frhelper
 	pkgdesc = Proprietary French dictionary software for linux
 	pkgver = 12.5.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.eudic.net/v4/fr/app/frhelper
 	arch = x86_64
 	license = unknown
@@ -9,7 +9,7 @@ pkgbase = frhelper
 	depends = qt5-speech
 	depends = qt5-webkit
 	provides = eudic-fr
-	source = frhelper-12.5.3.deb::https://static.frdic.com/pkg/frhelper.deb?v=2021-02-06
+	source = frhelper-12.5.3.deb::https://static.frdic.com/pkg/frhelper.deb?v=2021-04-14
 	sha512sums = 95ca8e7b198859215ae7b8cafc67a86c0d9aec45fca64fa6898df25d6254930a53f3543ed27cd73a6bc72d5f0a7965cf603a18b8d52840aedf258a52f2d62199
 
 pkgname = frhelper
diff --git a/PKGBUILD b/PKGBUILD
index fdd5dd7dd1fc..c60800a7bae9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,11 @@
-# Maintainer: yjun <jerrysteve1101 at gmail dot com>
 # Maintainer: sukanka <su975853527 at gmail dot com>
 
 pkgname=frhelper
 pkgver=12.5.3
-_date=2021-02-06
+_date=2021-04-14
 _lang=fr
 _flang=French
-pkgrel=1
+pkgrel=2
 pkgdesc="Proprietary  ${_flang} dictionary software for linux"
 arch=('x86_64')
 url="https://www.eudic.net/v4/${_lang}/app/${pkgname}"
@@ -20,6 +19,11 @@ provides=("eudic-${_lang}")
 source=("${pkgname}-${pkgver}.deb::https://static.frdic.com/pkg/${pkgname}.deb?v=${_date}")
 sha512sums=('95ca8e7b198859215ae7b8cafc67a86c0d9aec45fca64fa6898df25d6254930a53f3543ed27cd73a6bc72d5f0a7965cf603a18b8d52840aedf258a52f2d62199')
 
+# sometime use curl to download source deb, throws 404 not found. 
+# user other UA instead of origion one fixed it.
+# https://wiki.archlinux.org/index.php/Nonfree_applications_package_guidelines#Custom_DLAGENTS 
+DLAGENTS=("https::/usr/bin/curl -A 'Mozilla' -fLC - --retry 3 --retry-delay 3 -o %o %u")
+
 prepare() {
   mkdir -p build
 
@@ -27,29 +31,26 @@ prepare() {
 }
 
 package() {
-  mkdir -p ${pkgdir}/usr/share/eusoft-${pkgname}
-  mv build/usr/share/eusoft-${pkgname}/* ${pkgdir}/usr/share/eusoft-${pkgname}
-  
-  
-  cp -pr build/usr/share/* ${pkgdir}/usr/share/ 
-  
+  _dirname=eusoft-${pkgname}
 
+  install -dm755 ${pkgdir}/usr/share
+
+  cp -pvr build/usr/share/* ${pkgdir}/usr/share/ 
+  
   # link executable
-  mkdir ${pkgdir}/usr/bin/
-  ln -s /usr/share/eusoft-${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -dm755 ${pkgdir}/usr/bin/
+  ln -s /usr/share/${_dirname}/${pkgname} \
+        ${pkgdir}/usr/bin/${pkgname}
 
-  # desktop enrty
-  sed -i "s|/usr/share/eusoft-${pkgname}/AppRun|${pkgname}|g" ${pkgdir}/usr/share/applications/eusoft-${pkgname}.desktop
+  # desktop entry
+  sed -i "s|/usr/share/${_dirname}/AppRun|${pkgname}|g" \
+         ${pkgdir}/usr/share/applications/eusoft-${pkgname}.desktop
   
   # qt plugin path
-  sed -i '4c Prefix = /usr/lib/qt/' ${pkgdir}/usr/share/eusoft-${pkgname}/qt.conf
+  sed -i '4c Prefix = /usr/lib/qt/' \
+         ${pkgdir}/usr/share/${_dirname}/qt.conf
   
   # remove unused files.
-  rm -rf ${pkgdir}/usr/share/eusoft-${pkgname}/gstreamer-1.0/
-  rm -rf ${pkgdir}/usr/share/eusoft-${pkgname}/lib/
-  rm -rf ${pkgdir}/usr/share/eusoft-${pkgname}/plugins/
-  rm -rf ${pkgdir}/usr/share/eusoft-${pkgname}/*.so.*
-  rm -rf ${pkgdir}/usr/share/eusoft-${pkgname}/AppRun
-  
+  rm -rf ${pkgdir}/usr/share/${_dirname}/{gstreamer-1.0,lib,libcrypto.so.1.0.0,libssl.so.1.0.0,AppRun,plugins} 
 }
 # vim: ts=2 sw=2 et: