prefer shell based unstring function

diff --git a/list.sh b/list.sh
index e7b856c81346cf3d96488de569dd3d36f768ad53..1ae43f19e58c1911dcf2bbfba0fd4ed8bfbc1f52 100644 (file)
--- a/list.sh
+++ b/list.sh
@@ -35,8 +35,8 @@ list_item() {
       "$link" "$link" "${name##/}" \
       "$((length / 60))" "$((length % 60))" \
       "$width" "$height" \
-      "$(printf '%s\n' "${tags#tags=}" \
-         | sed -r "$UNSTRING"' s;^;,;; s;,+;,;g; s;,$;;;
+      "$(UNSTRING "${tags#tags=}" \
+         | sed -r 's;^;,;; s;,+;,;g; s;,$;;;
                    :X s;,-?([^,]+)(,|$); [span .tag\n \1]\2;; tX;'
       )" "$name" "$link" "$link"
   else

diff --git a/view.sh b/view.sh
index 90075f7a86b792153484bf3c2a62be0e760b6874..3aa4d97bfbc55a027d98b683ba325b66880fbd11 100644 (file)
--- a/view.sh
+++ b/view.sh
@@ -37,7 +37,7 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
   [span .time %i:%02imin] [span .dim %ix%i] %s
   ' "$(HTML "${ITEM##*/}" |sed -r "$w_ascii"' s;[^0-9a-zA-Z&#];&[wbr];g')" \
     "$((length / 60))" "$((length % 60))" "$width" "$height" \
-    "$(printf '%s\n' "${tags#tags=}" |sed -r "$UNSTRING"'
+    "$(UNSTRING "${tags#tags=}" |sed -r '
        s;^;,;; s;,+;,;g; s;,$;;; :X s;,-?([^,]+)(,|$); [span .tag\n \1]\2;; tX;'
     )"
   printf '