From 4c6cfeed0f210842e9b077ecaabe5d11517cf76b Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sun, 24 Apr 2022 15:01:18 +0000 Subject: [PATCH] update-smart-drivedb.in: Don't use semicolon in sed scripts. This also fixes a syntax error if sed requires ';' before '}'. git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5357 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/ChangeLog | 5 +++++ smartmontools/update-smart-drivedb.in | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index 92266763a..75a0c21bb 100644 --- a/smartmontools/ChangeLog +++ b/smartmontools/ChangeLog @@ -1,5 +1,10 @@ $Id$ +2022-04-24 Christian Franke <franke@computer.org> + + update-smart-drivedb.in: Don't use semicolon in sed scripts. + This also fixes a syntax error if sed requires ';' before '}'. + 2022-04-23 Gabriele Pohl <contact@dipohl.de> drivedb.h: diff --git a/smartmontools/update-smart-drivedb.in b/smartmontools/update-smart-drivedb.in index bf11d2c77..bd0208ff9 100644 --- a/smartmontools/update-smart-drivedb.in +++ b/smartmontools/update-smart-drivedb.in @@ -542,8 +542,10 @@ gpg_verify() get_db_version() { local r v x - x=$(sed -n '/^[ {]*"VERSION: *[^"]*"/{s,^[ {]*"VERSION: \([1-9][./0-9]* [^"]*\)".*$,\1,p;q}' "$1") \ - || return 1 + x=`sed -n '/^[ {]*"VERSION: *[^"]*"/{ + s,^[ {]*"VERSION: \([1-9][./0-9]* [^"]*\)".*$,\1,p + q + }' "$1"` || return 1 v=${x%% *} test -n "$v" || return 0 if [ "${v%/*}" = "$v" ]; then # trunk: get rev from expanded SVN-Id -- GitLab