diff options
| author | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-10-09 23:13:00 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-10-09 23:13:00 +0200 |
| commit | 9779179614cb7586d14ac130bd2eabaaf6158d89 (patch) | |
| tree | 288d5b278e33facb3529ec6484f8dca57988bef7 | |
| parent | a9e63edad93da6b2af6856e1f8b990c8441164a1 (diff) | |
| parent | dfdc8e3ffc5007378fdcf71071d18cd5fee9b8cb (diff) | |
| download | plan9front-9779179614cb7586d14ac130bd2eabaaf6158d89.tar.xz | |
merge
| -rw-r--r-- | sys/lib/dist/usr/glenda/lib/plumbing | 3 | ||||
| -rwxr-xr-x | sys/lib/newuser | 3 | ||||
| -rw-r--r-- | sys/lib/plumb/basic | 15 |
3 files changed, 9 insertions, 12 deletions
diff --git a/sys/lib/dist/usr/glenda/lib/plumbing b/sys/lib/dist/usr/glenda/lib/plumbing index b209d2d66..c2fb7cf6b 100644 --- a/sys/lib/dist/usr/glenda/lib/plumbing +++ b/sys/lib/dist/usr/glenda/lib/plumbing @@ -1,6 +1,7 @@ # to update: cp /usr/glenda/lib/plumbing /mnt/plumb/rules -editor = acme +editor = sam +browser = mothra include basic diff --git a/sys/lib/newuser b/sys/lib/newuser index 147fb545d..b06b8e1fd 100755 --- a/sys/lib/newuser +++ b/sys/lib/newuser @@ -61,7 +61,8 @@ case con cat > lib/plumbing <<! # to update: cp /usr/$user/lib/plumbing /mnt/plumb/rules -editor = acme +editor = sam +browser = mothra include basic diff --git a/sys/lib/plumb/basic b/sys/lib/plumb/basic index 3d7ad240e..6f2462796 100644 --- a/sys/lib/plumb/basic +++ b/sys/lib/plumb/basic @@ -7,16 +7,11 @@ include fileaddr plumb to seemail plumb to showmail -# cheap http/gif,jpeg,ps,pdf renderer +# open urls with web browser type is text -data matches '(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|prospero)://[a-zA-Z0-9_@\-]+([.:][a-zA-Z0-9_@\-]+)*/?[a-zA-Z0-9_?.,%#~&/\-+=]+([:.][a-zA-Z0-9_?,%#~&/\-+=]+)*\.(jpe?g|JPE?G|gif|GIF|ps|PS|pdf|PDF|png|PNG)' -plumb start rc -c 'hget '''$0''' | page -w' - -## open urls with abaco web browser -#type is text -#data matches 'https?://[a-zA-Z0-9_@\-]+([.:][a-zA-Z0-9_@\-]+)*/?[a-zA-Z0-9_?,%#~&/\-+=]+([:.][a-zA-Z0-9_?,''%#~&/\-+=;]+)*' -#plumb to web -#plumb client window abaco +data matches 'https?://[^ ]+' +plumb to web +plumb client window $browser # rtf files go to wdoc2txt type is text @@ -50,7 +45,7 @@ plumb client page -wi # the port is here for reference but is unused type is text data matches '[a-zA-Z¡-0-9_\-./]+' -data matches '([a-zA-Z¡-0-9_\-./]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI|doc|DOC)' +data matches '([a-zA-Z¡-0-9_\-./]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI|doc|DOC|epub|EPUB|cb[tz]|CB[TZ])' arg isfile $0 plumb to postscript plumb start page -w $file |