Cosmetic changes; package mostly unchanged

3 files changed, 33 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2601571e6256..b17b8e1ef893 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = dict-freedict-eng-fra-bin
-	pkgdesc = English -> French dictionary for dictd et al. from Freedict.org
+	pkgdesc = English -> French dictionary for dictd et al. from FreeDict.org
 	pkgver = 0.1.6
-	pkgrel = 4
+	pkgrel = 5
 	url = https://freedict.org/
 	install = dict-freedict-eng-fra-bin.install
 	arch = any
 	license = GPL
 	optdepends = dictd: dict client and server
-	provides = dict-freedict-eng-fra
+	provides = dict-freedict-eng-fra=0.1.6
 	conflicts = dict-freedict-eng-fra
 	source = https://download.freedict.org/dictionaries/eng-fra/0.1.6/freedict-eng-fra-0.1.6.dictd.tar.xz
 	sha512sums = ae83b68b0bf64436eb3bff28293357e57e1caa196397327cf72fdc6f725c9ed68329b5ef32d50ff3a4ff99590791c8eee289f9d9f5f48cf247c9802a042cd43a
 
 pkgname = dict-freedict-eng-fra-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index 5f07d8c072f6..a4acda6b0aad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,32 +4,33 @@
 # Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
 
 _lang=eng-fra
-_pkgname=dict-freedict-${_lang}
-pkgname=${_pkgname}-bin
-pkgver=0.1.6
-pkgrel=4
-pkgdesc="English -> French dictionary for dictd et al. from Freedict.org"
+_pkgname="dict-freedict-${_lang}"
+pkgname="${_pkgname}-bin"
+_pkgver=0.1.6
+pkgver="${_pkgver//-/_}"
+pkgrel=5
+pkgdesc="English -> French dictionary for dictd et al. from FreeDict.org"
 arch=('any')
 url="https://freedict.org/"
 license=('GPL')
 optdepends=('dictd: dict client and server')
-provides=(${_pkgname})
-conflicts=(${_pkgname})
-install=${pkgname}.install
-source=("https://download.freedict.org/dictionaries/${_lang}/${pkgver}/freedict-${_lang}-${pkgver}.dictd.tar.xz")
+provides=("${_pkgname}=${pkgver}")
+conflicts=("$_pkgname")
+install="${pkgname}.install"
+source=("https://download.freedict.org/dictionaries/${_lang}/${_pkgver}/freedict-${_lang}-${_pkgver}.dictd.tar.xz")
 sha512sums=('ae83b68b0bf64436eb3bff28293357e57e1caa196397327cf72fdc6f725c9ed68329b5ef32d50ff3a4ff99590791c8eee289f9d9f5f48cf247c9802a042cd43a')
 
 package()
 {
 	install -m 755 -d "${pkgdir}/usr/share/dictd"
 	install -m 644 -t "${pkgdir}/usr/share/dictd/" \
-		${_lang}/${_lang}.{dict.dz,index}
+		"${_lang}/${_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-eng-fra-bin.install b/dict-freedict-eng-fra-bin.install
index 5607f60d4447..0abdc0c1aecc 100644
--- a/dict-freedict-eng-fra-bin.install
+++ b/dict-freedict-eng-fra-bin.install
@@ -1,10 +1,12 @@
+# Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
+
 basename=eng-fra
-pkgname=dict-freedict-$basename-bin
+pkgname="dict-freedict-${basename}-bin"
 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