fix tarballer sed-fu in other packages, too

3 files changed, 18 insertions, 12 deletions

diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 2dbc5c3d..7e04423d 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -36,10 +36,12 @@ eval "$(
 for ((i=0; i<${#source[@]}; i++)); do
   infos=$(
     printf '%s\n' "${source[${i}]}" | \
-      sed -n '
-        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@
-        T
-        p
+      sed '
+        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=[^?]\+\)$@\3 \2 \4 \5 \6@
+        t
+        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)#\(\(tag\|commit\)=[^?]\+\)\(?signed\)\?$@\3 \2 \4 \7 \5@
+        t
+        d
       '
   )
   if [ -n "${infos}" ]; then
diff --git a/extra/linux-olpc-xo1/PKGBUILD b/extra/linux-olpc-xo1/PKGBUILD
index 116f9e5a..186551fa 100644
--- a/extra/linux-olpc-xo1/PKGBUILD
+++ b/extra/linux-olpc-xo1/PKGBUILD
@@ -196,10 +196,12 @@ done
 for ((i=0; i<${#source[@]}; i++)); do
   infos=$(
     printf '%s\n' "${source[${i}]}" | \
-      sed -n '
-        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@
-        T
-        p
+      sed '
+        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=[^?]\+\)$@\3 \2 \4 \5 \6@
+        t
+        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)#\(\(tag\|commit\)=[^?]\+\)\(?signed\)\?$@\3 \2 \4 \7 \5@
+        t
+        d
       '
   )
   if [ -n "${infos}" ]; then
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index e9656301..314e5eb0 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -22,10 +22,12 @@ eval "$(
 for ((i=0; i<${#source[@]}; i++)); do
   infos=$(
     printf '%s\n' "${source[${i}]}" | \
-      sed -n '
-        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@
-        T
-        p
+      sed '
+        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=[^?]\+\)$@\3 \2 \4 \5 \6@
+        t
+        s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)#\(\(tag\|commit\)=[^?]\+\)\(?signed\)\?$@\3 \2 \4 \7 \5@
+        t
+        d
       '
   )
   if [ -n "${infos}" ]; then