From 20ac7ec67ba31315b8cccf0ea70b6fa4a5d0efae Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 25 Jun 2024 00:18:12 +0100 Subject: lib.sh: simplify reading of version files Signed-off-by: Leah Rowe --- include/lib.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/lib.sh b/include/lib.sh index 32499bc0..c21a4a1d 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -45,8 +45,9 @@ chkvars() eval `setvars "" tmpdir _nogit board boarddir relname versiondate projectsite \ projectname aur_notice cfgsdir datadir version` -read -r projectname < projectname || : -read -r projectsite < projectsite || : +for fv in projectname projectsite version versiondate; do + eval "[ ! -f "$fv" ] || read -r $fv < \"$fv\" || :" +done setcfg() { @@ -120,11 +121,9 @@ x_() { [ -e ".git" ] || [ -f "versiondate" ] || printf "1716415872\n" > versiondate || \ $err "Cannot generate unknown versiondate file" -[ ! -f version ] || read -r version < version || : version_="$version" [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \ version="git-$(git rev-parse HEAD 2>&1)" || version="$version_" -[ ! -f versiondate ] || read -r versiondate < versiondate || : versiondate_="$versiondate" [ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \ --pretty='%ct' HEAD)" || versiondate="$versiondate_" -- cgit v1.2.1