From 8d08f987914539fb1bf9e65c5799476f40cc103b Mon Sep 17 00:00:00 2001 From: speedie Date: Tue, 28 Mar 2023 03:10:09 +0200 Subject: [PATCH] use long arguments --- scripts/examples/spmenu_musiclist.sh | 2 +- scripts/examples/spmenu_pdflist.sh | 2 +- scripts/examples/spmenu_sweden.sh | 2 +- scripts/spmenu_run | 2 +- scripts/spmenu_test | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/examples/spmenu_musiclist.sh b/scripts/examples/spmenu_musiclist.sh index 366495f..a180cc8 100755 --- a/scripts/examples/spmenu_musiclist.sh +++ b/scripts/examples/spmenu_musiclist.sh @@ -9,7 +9,7 @@ [ -z "$prefix" ] && prefix="/tmp/.list_songs" [ -z "$RUNLAUNCHER" ] && RUNLAUNCHER="spmenu" -[ -z "$RUNLAUNCHER_ARGS" ] && RUNLAUNCHER_ARGS="-l 40 -g 1 -is 200 -ngc" +[ -z "$RUNLAUNCHER_ARGS" ] && RUNLAUNCHER_ARGS="--lines 40 --columns 1 --image-size 200 --no-generate-cache" create_list() { [ -z "$i" ] && i=1 diff --git a/scripts/examples/spmenu_pdflist.sh b/scripts/examples/spmenu_pdflist.sh index d882ecb..584045f 100755 --- a/scripts/examples/spmenu_pdflist.sh +++ b/scripts/examples/spmenu_pdflist.sh @@ -3,7 +3,7 @@ c="$(find *.pdf -type f | wc -l)" i=1 [ -z "$prefix" ] && prefix="/tmp/.list_pdfs"; mkdir -p ${prefix} [ -z "$RUNLAUNCHER" ] && RUNLAUNCHER="spmenu" -[ -z "$RUNLAUNCHER_ARGS" ] && RUNLAUNCHER_ARGS="-l 40 -g 1 -is 400 -ngc" +[ -z "$RUNLAUNCHER_ARGS" ] && RUNLAUNCHER_ARGS="--lines 40 --columns 1 --image-size 400 --no-generate-cache" print_list() { while true; do diff --git a/scripts/examples/spmenu_sweden.sh b/scripts/examples/spmenu_sweden.sh index 219fdd1..60c21c7 100755 --- a/scripts/examples/spmenu_sweden.sh +++ b/scripts/examples/spmenu_sweden.sh @@ -15,4 +15,4 @@ ${bg_blue} ${bg_yellow} ${bg_blue}\n\ ${bg_blue} ${bg_yellow} ${bg_blue}\n\ \n\ ${reset}${fg_blue}c${fg_yellow}o${fg_blue}o${fg_yellow}l\n\ -" | spmenu -sgr4 "$color1" -sgr5 "$color3" -sgr12 "$color1" -sgr13 "$color3" -na -l 40 -g 7 "$@" +" | spmenu --sgr4 "$color1" --sgr5 "$color3" --sgr12 "$color1" --sgr13 "$color3" --no-alpha --lines 40 --columns 7 "$@" diff --git a/scripts/spmenu_run b/scripts/spmenu_run index a50166c..5f9cef2 100755 --- a/scripts/spmenu_run +++ b/scripts/spmenu_run @@ -8,7 +8,7 @@ path() { echo "$PATH" | tr ':' '\n' | uniq | sed 's#$#/#' | xargs ls -lu --time- # run spmenu and parse it parse() { - dout="$(path | sed "s/\&/\&/g" | spmenu -im -H "$HISTORY" "$@")" + dout="$(path | sed "s/\&/\&/g" | spmenu --insert --hist-file "$HISTORY" "$@")" # parse [ "$(printf '%c' "$dout")" = "#" ] && RUN_ARG="$TERMINAL" diff --git a/scripts/spmenu_test b/scripts/spmenu_test index 1f53edb..e842255 100755 --- a/scripts/spmenu_test +++ b/scripts/spmenu_test @@ -46,7 +46,7 @@ command -v maim > /dev/null && maim -uB > /tmp/image.png IMAGE="/tmp/image.png" main() { -[ -e "$IMAGE" ] && IMAGEARG="-is 500" && IMAGEPREFIX="IMG:" || IMAGE="" +[ -e "$IMAGE" ] && IMAGEARG="--image-size 500" && IMAGEPREFIX="IMG:" || IMAGE="" printf "$IMAGEPREFIX$IMAGE\t\ ${v1}\ @@ -107,7 +107,7 @@ ${v1}q${v2}w${v3}e${v4}r${v5}t${v6}y${v7}u${v8}i${v9}o${v10}p${v11}[${v12}]${v13 \n\ Arguments will be passed to spmenu.\n\ Report any issues at the Codeberg repo.\n\ -" | spmenu -na -l 40 $IMAGEARG "$@" -g 1 -p "spmenu test script" +" | spmenu --no-alpha --lines 40 $IMAGEARG "$@" --columns 1 --prompt "spmenu test script" } main "$@"