ref: 9779179614cb7586d14ac130bd2eabaaf6158d89
parent: a9e63edad93da6b2af6856e1f8b990c8441164a1
parent: dfdc8e3ffc5007378fdcf71071d18cd5fee9b8cb
author: cinap_lenrek <cinap_lenrek@centraldogma>
date: Sun Oct 9 19:13:00 EDT 2011
merge
--- 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
--- a/sys/lib/newuser
+++ b/sys/lib/newuser
@@ -61,7 +61,8 @@
cat > lib/plumbing <<!
# to update: cp /usr/$user/lib/plumbing /mnt/plumb/rules
-editor = acme
+editor = sam
+browser = mothra
include basic
--- a/sys/lib/plumb/basic
+++ b/sys/lib/plumb/basic
@@ -7,17 +7,12 @@
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'
+data matches 'https?://[^ ]+'
+plumb to web
+plumb client window $browser
-## 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
-
# rtf files go to wdoc2txt
type is text
data matches '[a-zA-Z¡-0-9_\-./]+'
@@ -50,7 +45,7 @@
# 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