From 99b03cc815a25e53e01f6c819a7edc838cf79d57 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 26 Apr 2019 08:33:30 +0200
Subject: checkDependencies: change format of cache file

---
 checkDependencies | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'checkDependencies')

diff --git a/checkDependencies b/checkDependencies
index 54c6d337..4adabae0 100755
--- a/checkDependencies
+++ b/checkDependencies
@@ -98,29 +98,25 @@ if [ ! -f '/tmp/packages' ]; then
     | sed '
       s/\([<>=]\S\+\)-\S\+$/\1/
     ' \
+    | sed '
+      s,^\(\S\+ \)\S\+/\([^/[:space:]]\+\)/\([^/[:space:]]\+\)\.db\.tar\.gz ,\1\2 \3 ,
+      s/\([<=>]\S\+\)\?$/ \1/
+    ' \
+    | sed '
+      s/ $/ X X/
+      t
+      s/\([<>]=\)\(\S\+\)$/\1 \2/
+      t
+      s/\([<>=]\)\(\S\+\)$/\1 \2/
+      t
+      w /dev/stderr
+    ' \
     | tee "${cache_file}"
   )
 else
   packages=$(cat "${cache_file}")
 fi
 
-packages=$(
-  printf '%s\n' "${packages}" \
-  | sed '
-    s,^\(\S\+ \)\S\+/\([^/[:space:]]\+\)/\([^/[:space:]]\+\)\.db\.tar\.gz ,\1\2 \3 ,
-    s/\([<=>]\S\+\)\?$/ \1/
-  ' \
-  | sed '
-    s/ $/ X X/
-    t
-    s/\([<>]=\)\(\S\+\)$/\1 \2/
-    t
-    s/\([<>=]\)\(\S\+\)$/\1 \2/
-    t
-    w /dev/stderr
-  '
-)
-
 matched_dependencies=$(
   join -1 1 -2 3 -o 1.1,2.1,2.2,2.5,1.3,2.4,1.2 <(
     printf '%s\n' "${packages}" \
-- 
cgit v1.2.3-54-g00ecf