diff options
| author |  keis <keijser@gmail.com> | 2011-01-17 20:50:20 +0100 |
|---|---|---|
| committer | keis <keijser@gmail.com> | 2011-01-17 21:08:06 +0100 |
| commit | e8814adcd1835d6faa0ad166ba1bf2aaf64bb5e0 (patch) | |
| tree | 1d491e1b7ea11738dc757eaff751abbbe9312a1b /examples/data/scripts/util/dmenu.sh | |
| parent | 15c83d8a85a150f46e80f7fc97041f10a43a96df (diff) | |
| parent | 835f5d8d09b429a4776192dbe00be5ae20704b16 (diff) | |
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into intcookies
Conflicts:
Makefile
Diffstat (limited to 'examples/data/scripts/util/dmenu.sh')
| -rw-r--r-- | examples/data/scripts/util/dmenu.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/examples/data/scripts/util/dmenu.sh b/examples/data/scripts/util/dmenu.sh index da61cae..354d7d1 100644 --- a/examples/data/scripts/util/dmenu.sh +++ b/examples/data/scripts/util/dmenu.sh @@ -60,10 +60,16 @@ fi if dmenu --help 2>&1 | grep -q '\[-xs\]'; then DMENU_XMMS_ARGS="-xs" DMENU_HAS_XMMS=1 +fi - if echo $DMENU_OPTIONS | grep -q -w 'xmms'; then - DMENU_ARGS="$DMENU_ARGS $DMENU_XMMS_ARGS" - fi +# Detect the tok patch +if dmenu --help 2>&1 | grep -q '\[-t\]'; then + DMENU_XMMS_ARGS="-t" + DMENU_HAS_XMMS=1 +fi + +if echo $DMENU_OPTIONS | grep -q -w 'xmms'; then + DMENU_ARGS="$DMENU_ARGS $DMENU_XMMS_ARGS" fi # Detect the vertical patch |