From feb2aceffad0ef60b1456c1b45bfff4b067e6138 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 25 Sep 2017 08:53:22 +0200
Subject: nimm leeres meta anstatt abzubrechen wenn meta.yml nicht auffindbar

---
 perlFunktionen | 58 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

(limited to 'perlFunktionen')

diff --git a/perlFunktionen b/perlFunktionen
index 1ee1137c..5e631dc5 100755
--- a/perlFunktionen
+++ b/perlFunktionen
@@ -65,34 +65,40 @@ versteheMetaYml() {
 
   if ! tar -tzf "${archiv}" "${_distdir}/META.yml"
   then
-    return 1
-  fi
 
-  echo "META.yml lesen ..."
-
-  meta="$(
-    tar -Oxzf "${archiv}" "${_distdir}/META.yml" | \
-      tr '\r' ' ' | \
-      grep -v "^\s*file:" | \
-      grep -v "^version:" | \
-      sed '
-        :begin;
-          $!N;
-          s@^\(\S.*\)\n\s\+\(\S.*\)$@\1 \2@;
-        tbegin;
-        P;
-        D
-      ' | \
-      sed "/^provides: /s@\(\s\S\+\):\s\+version:\s\+'\?v\?\([0-9.]\+\)'\?@\L\1=\2@g" | \
-      sed "/^provides: /s@\s@  @g" | \
-      sed "/^provides: /s@\(\s[^= ]\+\):\+\(\s\|\$\)@\L\1=${pkgver}\2@g" | \
-      sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)\.\([[:digit:]]\{3\}\)'\?\(\s\|\$\)@\1\2.\3.0\4@" | \
-      sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)\.\([[:digit:]]\{3\}\)\([[:digit:]]\+\)'\?\(\s\|\$\)@\1\2.\3.\4\5@" | \
-      sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)[._]0*\([1-9][[:digit:]]*\)[._]0*\([1-9][[:digit:]]*\)'\?\(\s\|\$\)@\1\2.\3.\4\5@" | \
-      sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)[._]0*\([1-9][[:digit:]]*\)[._]0\+'\?\(\s\|\$\)@\1\2.\3.0\4@"
-  )"
+    unset meta
+
+  else
+
+    echo "META.yml lesen ..."
+
+    meta="$(
+      tar -Oxzf "${archiv}" "${_distdir}/META.yml" | \
+        tr '\r' ' ' | \
+        grep -v "^\s*file:" | \
+        grep -v "^version:" | \
+        sed '
+          :begin;
+            $!N;
+            s@^\(\S.*\)\n\s\+\(\S.*\)$@\1 \2@;
+          tbegin;
+          P;
+          D
+        ' | \
+        sed "/^provides: /s@\(\s\S\+\):\s\+version:\s\+'\?v\?\([0-9.]\+\)'\?@\L\1=\2@g" | \
+        sed "/^provides: /s@\s@  @g" | \
+        sed "/^provides: /s@\(\s[^= ]\+\):\+\(\s\|\$\)@\L\1=${pkgver}\2@g" | \
+        sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)\.\([[:digit:]]\{3\}\)'\?\(\s\|\$\)@\1\2.\3.0\4@" | \
+        sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)\.\([[:digit:]]\{3\}\)\([[:digit:]]\+\)'\?\(\s\|\$\)@\1\2.\3.\4\5@" | \
+        sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)[._]0*\([1-9][[:digit:]]*\)[._]0*\([1-9][[:digit:]]*\)'\?\(\s\|\$\)@\1\2.\3.\4\5@" | \
+        sed "s@\(\sperl:\s\+\)'\?\([[:digit:]]\+\)[._]0*\([1-9][[:digit:]]*\)[._]0\+'\?\(\s\|\$\)@\1\2.\3.0\4@"
+    )"
+
+    echo -n "... fertig, "
+
+  fi
 
-  echo "... fertig, verarbeiten ..."
+  echo "verarbeiten ..."
 
   set +e
 
-- 
cgit v1.2.3-54-g00ecf