From 90dc244303eac42ad37c1f3b43f4d3cbb9b91c1c Mon Sep 17 00:00:00 2001 From: Einhard Leichtfuß Date: Fri, 29 Apr 2022 23:48:11 +0200 Subject: Simplify $pkgver handling Always set $_pkgver. - And set it first. (Derive $pkgver off it.) - Usually same as $pkgver. --- bin/sample.PKGBUILD | 4 ++-- src/sample.PKGBUILD | 4 ++-- svn/sample.PKGBUILD | 4 ++-- update.bash | 8 +------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/bin/sample.PKGBUILD b/bin/sample.PKGBUILD index 8634c33..dbb985d 100644 --- a/bin/sample.PKGBUILD +++ b/bin/sample.PKGBUILD @@ -6,8 +6,8 @@ _lang=%LANG% _pkgname="dict-freedict-${_lang}" pkgname="${_pkgname}-bin" -pkgver=%VER% -_pkgver="${pkgver//_/-}" +_pkgver=%VER% +pkgver="${_pkgver//-/_}" pkgrel=1 pkgdesc="%LANG_A% -> %LANG_B% dictionary for dictd et al. from FreeDict.org" arch=('any') diff --git a/src/sample.PKGBUILD b/src/sample.PKGBUILD index 6abe992..f22a6f0 100644 --- a/src/sample.PKGBUILD +++ b/src/sample.PKGBUILD @@ -5,8 +5,8 @@ _lang=%LANG% pkgname="dict-freedict-${_lang}" -pkgver=%VER% -_pkgver="${pkgver//_/-}" +_pkgver=%VER% +pkgver="${_pkgver//-/_}" pkgrel=1 pkgdesc="%LANG_A% -> %LANG_B% dictionary for dictd et al. from FreeDict.org" arch=('any') diff --git a/svn/sample.PKGBUILD b/svn/sample.PKGBUILD index a29aaf0..3f49e82 100644 --- a/svn/sample.PKGBUILD +++ b/svn/sample.PKGBUILD @@ -6,8 +6,8 @@ _lang=%LANG% _pkgname="dict-freedict-${_lang}" pkgname="${_pkgname}-svn" -pkgver=%VER% -_pkgver="${pkgver//_/-}" +_pkgver=%VER% +pkgver="${_pkgver//-/_}" pkgrel=2 pkgdesc="%LANG_A% -> %LANG_B% dictionary for dictd et al. from FreeDict.org" arch=('any') diff --git a/update.bash b/update.bash index 118aeb1..5be3658 100755 --- a/update.bash +++ b/update.bash @@ -93,18 +93,12 @@ function update replace '%LANG%' "$lang" replace '%LANG_A%' "$lang_a" replace '%LANG_B%' "$lang_b" - replace '%VER%' "$convver" + replace '%VER%' "$ver" replace '%LICENSES%' "${licenses[$lang]}" replace '%CHECKSUM%' "$checksum" replace_line '%CONTRS%' "${contrs[${lang}${ext}]}" normal - if [[ "$ver" == "$convver" ]] - then - delete_line '^_pkgver=\$\{pkgver\/\/_\/-\}$' - replace '_pkgver' 'pkgver' - fi - local rstring_base="${prepare[${lang}${ext}]}" local rstring rstring=$'\n'"$(sed -E 's/^/\t/' <<< "$rstring_base")"$'\n' -- cgit v1.2.3