modified trimmer

This commit is contained in:
alanw 2023-05-09 14:34:15 -07:00
parent f9b664efa1
commit 0bd9104a89

View file

@ -554,7 +554,7 @@ chained-grep(){
# Remove leading/trailing whitespace # Remove leading/trailing whitespace
trim() { trim() {
local var=$1 local var=${@:2}
var="${var#"${var%%[![:space:]]*}"}" var="${var#"${var%%[![:space:]]*}"}"
var="${var%"${var##*[![:space:]]}"}" var="${var%"${var##*[![:space:]]}"}"
printf '%s' "$var" printf '%s' "$var"
@ -570,15 +570,17 @@ strip-html-tags() {
run-from-url(){ run-from-url(){
url=$1 url=$1
# boxline "url=$url"
args=${*:2} args=${*:2}
# boxline "args=$args"
# check the interpreter using the shebang at the top of the file # check the interpreter using the shebang at the top of the file
interpreter=$(curl -ks $url | head -n 1 | sed -e 's/\#\!//g' 2>/dev/null) interpreter=$(curl -ks $url | head -n 1 | cut -c 2- 2>/dev/null)
boxline "interpreter=$interpreter" # boxline "interpreter=$interpreter"
# In case of missing shebang, default to bash # In case of missing shebang, default to bash
if [ -z $interpreter ] ; then if [ -z $interpreter ] ; then
interpreter="/bin/bash" interpreter="/bin/bash"
fi fi
logger boxline "Running online script $url with args $args" boxline "Running online script $url with args $args"
if [[ "$interpreter" == "/bin/bash" ]] ; then if [[ "$interpreter" == "/bin/bash" ]] ; then
run curl -H 'Cache-Control: no-cache' -ks $url | $interpreter -s -- $args run curl -H 'Cache-Control: no-cache' -ks $url | $interpreter -s -- $args
else else