Explorar el Código

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 hace 9 años
padre
commit
11764e1d5a
Se han modificado 1 ficheros con 4 adiciones y 5 borrados
  1. 4
    5
      src/libexec/saturnin-dmenu

+ 4
- 5
src/libexec/saturnin-dmenu Ver fichero

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