plumb rules for page, make sam and mothra the default

diff --git a/sys/lib/dist/usr/glenda/lib/plumbing b/sys/lib/dist/usr/glenda/lib/plumbing
index b209d2d66d8e4272f67ede53a03ef1baa4e5f1d5..c2fb7cf6b287b91ceb0a3a8ee73a025cc9512155 100644 (file)
--- 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 147fb545d0379c0dbe3efaf3945485b2a2774e38..b06b8e1fda216b6091c43655358bcaf62c985f96 100755 (executable)
--- 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 3d7ad240ed7b458d2033305d9f2e825e164e8dd2..9f2aacba9fe2f1daf825c3c6e43d920ed1696b18 100644 (file)
--- 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|x?html?|X?HTML?|epub|EPUB|cb[tz]|CB[TZ])'
 arg isfile     $0
 plumb to postscript
 plumb start page -w $file