From 79165e9ef694062703e872ba99a17ee53ca9d4a4 Mon Sep 17 00:00:00 2001
From: Einhard Leichtfuß <alguien@respiranto.de>
Date: Fri, 29 Apr 2022 14:45:01 +0200
Subject: Consistent quoting

---
 TODO                |  7 +++----
 bin/sample.PKGBUILD | 20 ++++++++++----------
 general-config.sh   | 16 ++++++++--------
 src/sample.PKGBUILD | 16 ++++++++--------
 svn/sample.PKGBUILD | 26 +++++++++++++-------------
 update.sh           |  8 ++++----
 6 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/TODO b/TODO
index 0809e44..27c294e 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,13 @@
 TODO file for aur-fd-scripts
 
 [GENERAL]
-* Move dictd make dependency to freedict-tools.
 * Use updpkgsums from pacman-contrib.
 * (Better) error handling.
 * Avoid looping over all packages when only one is to be updated.
 * [consider] Unify the different sample.PKGBUILDs.
+* Prohibit update of deu-eng, eng-deu src and svn versions.
+  - They are created manually.
+  - Alternatively, adapt the system to account for the differences.
 
 [FEATURES]
 * Check for update of freedict-tools.
@@ -17,6 +19,3 @@ TODO file for aur-fd-scripts
 * Add $basedir in user-config.default.sh
 * check(): `make validation'
   - The .dtd and .rng files would need to be included in the tools package.
-
-[NON-FUNCTIONAL]
-* Be consistent in quoting.
diff --git a/bin/sample.PKGBUILD b/bin/sample.PKGBUILD
index bf41f10..e4961ea 100644
--- a/bin/sample.PKGBUILD
+++ b/bin/sample.PKGBUILD
@@ -4,19 +4,19 @@
 # Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
 
 _lang=%LANG%
-_pkgname=dict-freedict-${_lang}
-pkgname=${_pkgname}-bin
+_pkgname="dict-freedict-${_lang}"
+pkgname="${_pkgname}-bin"
 pkgver=%VER%
-_pkgver=${pkgver//_/-}
+_pkgver="${pkgver//_/-}"
 pkgrel=1
 pkgdesc="%LANG_A% -> %LANG_B% dictionary for dictd et al. from FreeDict.org"
 arch=('any')
 url="https://freedict.org/"
 license=(%LICENSES%)
 optdepends=('dictd: dict client and server')
-provides=(${_pkgname})
-conflicts=(${_pkgname})
-install=${pkgname}.install
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+install="${pkgname}.install"
 source=("https://download.freedict.org/dictionaries/${_lang}/${_pkgver}/freedict-${_lang}-${_pkgver}.dictd.tar.xz")
 sha512sums=('%CHECKSUM%')
 
@@ -26,13 +26,13 @@ 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/general-config.sh b/general-config.sh
index 43b10b3..040ec6a 100644
--- a/general-config.sh
+++ b/general-config.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2018 Einhard Leichtfuß
+# Copyright 2018,2022 Einhard Leichtfuß
 #
 # general-config.sh - general configuration options
 #
@@ -37,7 +37,7 @@ wikdict_langs=(
 	)
 
 typeset -a langs
-langs=( ${vcs_langs[@]} ${wikdict_langs[@]} )
+langs=( "${vcs_langs[@]}" "${wikdict_langs[@]}" )
 
 
 # Long names table.
@@ -61,14 +61,14 @@ contrs[eng-fra-bin]=\
 
 # Licenses (indexed by $lang)
 typeset -A licenses
-for lang in ${vcs_langs[@]}
+for lang in "${vcs_langs[@]}"
 do
-	licenses[$lang]="'GPL'"
+	licenses["$lang"]="'GPL'"
 done
 
-for lang in ${wikdict_langs[@]}
+for lang in "${wikdict_langs[@]}"
 do
-	licenses[$lang]="'CCPL:by-sa' 'FDL'"
+	licenses["$lang"]="'CCPL:by-sa' 'FDL'"
 done
 
 
@@ -79,11 +79,11 @@ typeset -A prepare
 prepare[deu-fra]=\
 'prepare()
 {
-	cd $_lang
+	cd "$_lang"
 	sed -Ei \
 		-e '"'"'s/(10)(10)(100\>)(\s+\(10)(Googol.*(1|Eins) mit einem Googol Nullen)/\1^(\2^\3)\4^\5/'"'"' \
 		-e '"'"'s/(10)([1-9][0-9]*)(.*(1|Eins) mit \2 Nullen)/\1\^\2\3/'"'"' \
 		-e '"'"'s/(die Zahl 10)(60)/\1^\2/'"'"' \
-		${_lang}.tei
+		"${_lang}.tei"
 }
 '
diff --git a/src/sample.PKGBUILD b/src/sample.PKGBUILD
index d93f0b3..6abe992 100644
--- a/src/sample.PKGBUILD
+++ b/src/sample.PKGBUILD
@@ -4,9 +4,9 @@
 # Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
 
 _lang=%LANG%
-pkgname=dict-freedict-${_lang}
+pkgname="dict-freedict-${_lang}"
 pkgver=%VER%
-_pkgver=${pkgver//_/-}
+_pkgver="${pkgver//_/-}"
 pkgrel=1
 pkgdesc="%LANG_A% -> %LANG_B% dictionary for dictd et al. from FreeDict.org"
 arch=('any')
@@ -14,7 +14,7 @@ url="https://freedict.org/"
 license=(%LICENSES%)
 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=('%CHECKSUM%')
 
@@ -22,7 +22,7 @@ sha512sums=('%CHECKSUM%')
 
 build()
 {
-	cd $_lang
+	cd "$_lang"
 	make FREEDICT_TOOLS=/usr/lib/freedict-tools build-dictd
 }
 
@@ -30,13 +30,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/svn/sample.PKGBUILD b/svn/sample.PKGBUILD
index 12b8ade..870b813 100644
--- a/svn/sample.PKGBUILD
+++ b/svn/sample.PKGBUILD
@@ -4,10 +4,10 @@
 # Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
 
 _lang=%LANG%
-_pkgname=dict-freedict-${_lang}
-pkgname=${_pkgname}-svn
+_pkgname="dict-freedict-${_lang}"
+pkgname="${_pkgname}-svn"
 pkgver=%VER%
-_pkgver=${pkgver//_/-}
+_pkgver="${pkgver//_/-}"
 pkgrel=2
 pkgdesc="%LANG_A% -> %LANG_B% dictionary for dictd et al. from FreeDict.org"
 arch=('any')
@@ -15,22 +15,22 @@ url="https://freedict.org/"
 license=(%LICENSES%)
 optdepends=('dictd: dict client and server')
 makedepends=('subversion' 'freedict-tools')
-provides=(${_pkgname})
-conflicts=(${_pkgname})
-install=${pkgname}.install
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+install="${pkgname}.install"
 source=("svn+https://github.com/freedict/fd-dictionaries/trunk/${_lang}")
-md5sums=('SKIP')
+sha512sums=('SKIP')
 
 pkgver()
 {
-	cd $_lang
+	cd "$_lang"
 	local _ver="$(svnversion)"
 	printf "r%s" "${_ver//[[:alpha:]]}"
 }
 
 build()
 {
-	cd $_lang
+	cd "$_lang"
 	make FREEDICT_TOOLS=/usr/lib/freedict-tools build-dictd
 }
 
@@ -38,13 +38,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/update.sh b/update.sh
index c6f602d..f011164 100755
--- a/update.sh
+++ b/update.sh
@@ -2,7 +2,7 @@
 #
 # update.sh - script to check for updates and perform them (on the PKGBUILDs)
 #
-# Copyright 2018 Einhard Leichtfuß
+# Copyright 2018,2022 Einhard Leichtfuß
 #
 # This file is part of aur-fd-scripts
 #
@@ -69,7 +69,7 @@ function main
 	then
 		handle_all_vcs svn -svn "$@"
 	else
-		echo "Type $type not supported." >&2
+		echo "Type ${type} not supported." >&2
 		exit 1
 	fi
 }
@@ -137,7 +137,7 @@ function handle_all
 		cd $lang || exit 1
 		$nopull || git pull -q
 		pkgver="$(sed -En 's/\s*pkgver\s*=\s*(.+)\s*/\1/p' .SRCINFO)"
-		data="$(jq -r ".[] | select(.name == \"${lang}\") | .releases[] | select(.platform==\"$platform\")" ../../freedict-database.json)"
+		data="$(jq -r ".[] | select(.name == \"${lang}\") | .releases[] | select(.platform==\"${platform}\")" ../../freedict-database.json)"
 		ver="$(jq -r '.version' <<< "$data")"
 		url="$(jq -r '.URL' <<< "$data")"
 		checksum="$(jq -r '.checksum' <<< "$data")"
@@ -186,7 +186,7 @@ function handle_all_vcs
 
 	cd "$type" || exit 1
 
-	for lang in ${vcs_langs[@]}
+	for lang in "${vcs_langs[@]}"
 	do
 		cd $lang || exit 1
 		$nopull || git pull -q
-- 
cgit v1.2.3