bin/extract-attachment: also correctly extract attachments from non-multipart messages

1 files changed, 14 insertions, 7 deletions

diff --git a/bin/extract-attachment b/bin/extract-attachment
index b28a691..b8824b2 100755
--- a/bin/extract-attachment
+++ b/bin/extract-attachment
@@ -15,12 +15,19 @@ last_line=$(
     | tail -n1
 )
 
-borders=$(
-  printf '%s\n' "${cnt}" \
-    | grep -nxF -- "${last_line%--}" \
-    | cut -d: -f1
-  printf '%s\n' '$'
-)
+if [ -z "${last_line##*--}" ]; then
+  borders=$(
+    printf '%s\n' "${cnt}" \
+      | grep -nxF -- "${last_line%--}" \
+      | cut -d: -f1
+    printf '%s\n' '$'
+  )
+else
+  borders=$(
+    printf '%s\n' '1' '$'
+  )
+  last_line="${last_line}qwertzuiop"
+fi
 
 start=''
 decode=false
@@ -30,7 +37,7 @@ for end in ${borders}; do
       printf '%s\n' "${cnt}" \
         | sed -n "
           ${start} d
-          ${end} d
+          ${end} { /^${last_line}\$/ d }
           ${start},${end} p
         " \
         | sed '