From 9a6eef7b3d4adbcc840cd1f6fe667b80d7407e7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Wed, 16 Oct 2019 14:14:17 +0200 Subject: [PATCH] Squashed 'clickslide/' changes from eb622bf..6f30b5e 6f30b5e better portability git-subtree-dir: clickslide git-subtree-split: 6f30b5e9508fdeb5506d8fb1718db8c757329048 --- clickslide.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/clickslide.sh b/clickslide.sh index b1fd229..7024914 100755 --- a/clickslide.sh +++ b/clickslide.sh @@ -8,6 +8,9 @@ _base64() { if which uuencode >/dev/null; then uuencode -m - <"$1" \ | sed '1d; :X;$!{N;bX;}; s;\n;;g; s;=\+;;g;' + elif which busybox >/dev/null; then + busybox uuencode -m - <"$1" \ + | sed '1d; :X;$!{N;bX;}; s;\n;;g; s;=\+;;g;' else base64 <"$1" \ | sed ':X;$!{N;bX;}; s;\n;;g; s;=\+;;g;' @@ -16,13 +19,13 @@ _base64() { { "${0%/*}"/cgilite/html-sh.sed || cat; } \ | { - line="$(line)" + read -r line while :; do tag="${tag}${line%%>*}" if [ "$line" = "${line%%>*}" ]; then # $line did not contain ">" and thus was added to $tag entirely - if ! line="$(line)"; then + if ! read -r line; then printf %s\\n "$tag" break fi @@ -30,7 +33,7 @@ _base64() { " else # $line is shortened by segment added to $tag - line="${line#*>}" + read -r line tag="${tag}>" fi -- 2.39.2