From 47eb00790cfe9badb8f08d4f3e7e3241f1f1649f Mon Sep 17 00:00:00 2001 From: epochqwert Date: Thu, 12 Apr 2018 10:48:08 +0000 Subject: better format string cutting in printfurl and start now single-quote escapes the url before sending it to printf url --- printfurl | 2 +- start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/printfurl b/printfurl index 91fd388..c141bc1 100755 --- a/printfurl +++ b/printfurl @@ -1,5 +1,5 @@ #!/bin/sh -cutargs="$(printf "%s\n" "$1" | tr '%' '\n' | tail -n+2 | grep '^[sukdPpqfU]' | sed 's/^\(.\).*/-\1/g')" +cutargs="$(printf "%s\n" "$1" | sed 's/%[^sukdPpqfU]//g' | tr '%' '\n' | tail -n+2 | sed 's/^\(.\).*/-\1/g' | tr '\n' ' ')" count="$(echo $cutargs | tr '-' '\n' | grep -c .)" printfargs="$(printf "%s\n" "$1" | sed 's/%[sukdPpqfU]/%s/g')" cuturl "$cutargs" | tr '\n' '\0' | xargs -n $count -0 printf "$printfargs" diff --git a/start b/start index 873f792..9a3dca6 100755 --- a/start +++ b/start @@ -1,4 +1,4 @@ #!/bin/sh scheme="$(printf "%s\n" "$1" | cuturl -s)" line="$(grep "^${scheme}:" ~/.config/start.conf | cut -d: -f2-)" -eval "$(printf "%s\n" "$1" | printfurl "$line" )" +eval "$(printf "%s\n" "$1" | sed 's/'\''/'\''\\'\'''\''/g' | printfurl "$line")" -- cgit v1.2.3