Update to version 2022.04.06

3 files changed, 31 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34735cf5e272..ebb56827be19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dict-freedict-fra-deu
-	pkgdesc = French -> German dictionary for dictd et al. from Freedict.org
-	pkgver = 2020.10.04
+	pkgdesc = French -> German dictionary for dictd et al. from FreeDict.org
+	pkgver = 2022.04.06
 	pkgrel = 1
 	url = https://freedict.org/
 	install = dict-freedict-fra-deu.install
@@ -9,8 +9,7 @@ pkgbase = dict-freedict-fra-deu
 	license = FDL
 	makedepends = freedict-tools
 	optdepends = dictd: dict client and server
-	source = https://download.freedict.org/dictionaries/fra-deu/2020.10.04/freedict-fra-deu-2020.10.04.src.tar.xz
-	sha512sums = 624ccbc0d6fcd298f244feab2a2001fa9881111007ff49f01d9de276ebb2b5ed0fe1a8ec87ae32e39b9616cc3e9d179c83182c891ef85efe4e69aea6dc43ad26
+	source = https://download.freedict.org/dictionaries/fra-deu/2022.04.06/freedict-fra-deu-2022.04.06.src.tar.xz
+	sha512sums = 8a615b676b80adf8964fc603c1002767af6da055e24bfd89ae2f3fd562af50c71944d699ff17892d773935109b73f438ec44565905f6ca5104d63db2521d12da
 
 pkgname = dict-freedict-fra-deu
-
diff --git a/PKGBUILD b/PKGBUILD
index 0b4272001fd5..ca02be0ae742 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,23 @@
 # Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
 
 _lang=fra-deu
-pkgname=dict-freedict-${_lang}
-pkgver=2020.10.04
+pkgname="dict-freedict-${_lang}"
+pkgver=2022.04.06
+pkgver="${pkgver//_/-}"
 pkgrel=1
-pkgdesc="French -> German dictionary for dictd et al. from Freedict.org"
+pkgdesc="French -> German dictionary for dictd et al. from FreeDict.org"
 arch=('any')
 url="https://freedict.org/"
 license=('CCPL:by-sa' 'FDL')
 optdepends=('dictd: dict client and server')
 makedepends=('freedict-tools')
-install=${pkgname}.install
+install="${pkgname}.install"
 source=("https://download.freedict.org/dictionaries/${_lang}/${pkgver}/freedict-${_lang}-${pkgver}.src.tar.xz")
-sha512sums=('624ccbc0d6fcd298f244feab2a2001fa9881111007ff49f01d9de276ebb2b5ed0fe1a8ec87ae32e39b9616cc3e9d179c83182c891ef85efe4e69aea6dc43ad26')
+sha512sums=('8a615b676b80adf8964fc603c1002767af6da055e24bfd89ae2f3fd562af50c71944d699ff17892d773935109b73f438ec44565905f6ca5104d63db2521d12da')
 
 build()
 {
-	cd $_lang
+	cd "$_lang"
 	make FREEDICT_TOOLS=/usr/lib/freedict-tools build-dictd
 }
 
@@ -26,13 +27,13 @@ package()
 {
 	install -m 755 -d "${pkgdir}/usr/share/dictd"
 	install -m 644 -t "${pkgdir}/usr/share/dictd/" \
-		${_lang}/build/dictd/${_lang}.{dict.dz,index}
+		"${_lang}/build/dictd/${_lang}".{dict.dz,index}
 
-	for file in ${_lang}/{AUTHORS,README,NEWS,ChangeLog}
+	for file in "$_lang"/{AUTHORS,README,NEWS,ChangeLog}
 	do
-		if test -f ${file}
+		if test -f "$file"
 		then
-			install -m 644 -Dt "${pkgdir}/usr/share/doc/freedict/${_lang}/" ${file}
+			install -m 644 -Dt "${pkgdir}/usr/share/doc/freedict/${_lang}/" "$file"
 		fi
 	done
 }
diff --git a/dict-freedict-fra-deu.install b/dict-freedict-fra-deu.install
index 04dc2beb74eb..235ba91eae33 100644
--- a/dict-freedict-fra-deu.install
+++ b/dict-freedict-fra-deu.install
@@ -1,10 +1,12 @@
+# Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
+
 basename=fra-deu
-pkgname=dict-freedict-$basename
+pkgname="dict-freedict-${basename}"
 dictd_conf=/etc/dict/dictd.conf
 datadir=/usr/share/dictd
-conf="database $basename {
-	data $datadir/$basename.dict.dz
-	index $datadir/$basename.index
+conf="database ${basename} {
+	data ${datadir}/${basename}.dict.dz
+	index ${datadir}/${basename}.index
 }"
 
 post_install()
@@ -12,12 +14,12 @@ post_install()
 	echo
 	if pacman -Qq dictd > /dev/null 2>&1
 	then
-		if grep -q "^database *$basename" "$dictd_conf"
+		if grep -q "^database *${basename}" "${dictd_conf}"
 		then
-			echo "$pkgname already configured in $dictd_conf"
+			echo "${pkgname} already configured in ${dictd_conf}"
 		else
-			echo "Adding configuration for $pkgname to $dictd_conf"
-			echo "$conf" >> "$dictd_conf"
+			echo "Adding configuration for ${pkgname} to ${dictd_conf}"
+			echo "${conf}" >> "${dictd_conf}"
 		fi
 		
 		if systemctl -q is-active dictd.service
@@ -54,17 +56,17 @@ post_remove()
 {
 	if pacman -Qq dictd > /dev/null 2>&1
 	then
-		current_conf="$(grep -A 3 "^database *$basename" "$dictd_conf")"
-		if test -n "$current_conf"
+		current_conf="$(grep -A 3 "^database *${basename}" "${dictd_conf}")"
+		if test -n "${current_conf}"
 		then
 			echo
-			if test "$current_conf" = "$conf"
+			if test "${current_conf}" = "${conf}"
 			then
-				echo "Removing configuration for $pkgname from $dictd_conf"
-				sed -i "/database $basename {/,/}/d" "$dictd_conf"
+				echo "Removing configuration for ${pkgname} from ${dictd_conf}"
+				sed -i "/database ${basename} {/,/}/d" "${dictd_conf}"
 			else
 				echo "User created / modified configuration" \
-					 "for $pkgname in $dictd_conf is left untouched."
+					 "for ${pkgname} in ${dictd_conf} is left untouched."
 			fi
 		fi