diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Functions/MIME/pick-web-browser | 15 |
2 files changed, 9 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index b628c065f..1dec512b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-09-11 Peter Stephenson <pws@csr.com> + * Baptiste Daroussin: 27268: Functions/MIME/pick-web-browser: + remove Perl dependency. + * Baptiste Daroussin: 27267 plus 27269 plus doc: Functions/Zftp/zfrtime, Doc/Zsh/zftpsys.yo: remove perl dependency. @@ -12152,5 +12155,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4774 $ +* $Revision: 1.4775 $ ***************************************************** diff --git a/Functions/MIME/pick-web-browser b/Functions/MIME/pick-web-browser index fe42c0bf5..26f4b6bb5 100644 --- a/Functions/MIME/pick-web-browser +++ b/Functions/MIME/pick-web-browser @@ -74,16 +74,11 @@ for bstyle in $bstyles; do # Get the name of all windows running; use the internal name, not # the friendly name, which is less useful. - # - # The nasty but portable version. - # The nice but non-portable version uses Perl, even though perl - # is more portable. - # windows=(${(f)"$(xwininfo -root -all | - # sed -ne 's/.*".*": ("\(.*\)" ".*").*/\1/p' |sort | uniq)"}) - - windows=(${(f)"$(xwininfo -root -all | - perl -ne '/.*"(.*)": \("(.*)" "(.*)"\).*/ and $w{$2} = 1; - END { print join("\n", keys %w), "\n" }')"}) + + windows=(${(ou)${(M)${(f)"$(xwininfo -root -all)"}:#*\"*\"\:[[:space:]]\(\"*}/(#b)*\"*\"\:[[:space:]]\(\"(*)\"[[:space:]]\"*\"\)*/$match[1]}) + #windows=(${(f)"$(xwininfo -root -all | + # perl -ne '/.*"(.*)": \("(.*)" "(.*)"\).*/ and $w{$2} = 1; + # END { print join("\n", keys %w), "\n" }')"}) # Is any browser we've heard of running? for browser in $xbrowsers; do |