Bläddra i källkod

Set default delimiter to space

Since `delim` is not empty by default, this also requires to change
logic for determinig if the split will be done--now it's true if any
of --split or --split-field have been provided.
Alois Mahdal 10 år sedan
förälder
incheckning
11764e1d5a
1 ändrade filer med 4 tillägg och 5 borttagningar
  1. 4
    5
      src/libexec/saturnin-dmenu

+ 4
- 5
src/libexec/saturnin-dmenu Visa fil

10
 numbered=false
10
 numbered=false
11
 lines=10
11
 lines=10
12
 maybe_split=cat
12
 maybe_split=cat
13
+delim=" "
13
 field=2-
14
 field=2-
14
 
15
 
15
 while true; do case $1 in
16
 while true; do case $1 in
16
     -l|--lines)     lines=$2; shift 2 ;;
17
     -l|--lines)     lines=$2; shift 2 ;;
17
-    --split)        delim=$2; shift 2 ;;
18
-    --split-field)  field=$2; shift 2 ;;
18
+    --split)        delim=$2; maybe_split=do_split; shift 2 ;;
19
+    --split-field)  field=$2; maybe_split=do_split; shift 2 ;;
19
     --help|--usage) usage             ;;
20
     --help|--usage) usage             ;;
20
     *)              break             ;;
21
     *)              break             ;;
21
 esac done
22
 esac done
22
 
23
 
23
-test -n "$delim"        && maybe_split=do_split
24
-
25
 nb="$(saturnin conf -p style.color.nbg)"
24
 nb="$(saturnin conf -p style.color.nbg)"
26
 nf="$(saturnin conf -p style.color.nfg)"
25
 nf="$(saturnin conf -p style.color.nfg)"
27
 sb="$(saturnin conf -p style.color.sbg)"
26
 sb="$(saturnin conf -p style.color.sbg)"
40
 }
39
 }
41
 
40
 
42
 do_split() {
41
 do_split() {
43
-    cut -d$delim -f$field
42
+    cut "-d$delim" -f$field
44
 }
43
 }
45
 
44
 
46
 dmenu -b -i -l $lines $(style) "$@" | $maybe_split
45
 dmenu -b -i -l $lines $(style) "$@" | $maybe_split