summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@rei2.9hal>2011-10-08 05:01:14 +0200
committercinap_lenrek <cinap_lenrek@rei2.9hal>2011-10-08 05:01:14 +0200
commitf3d84bdeca23f9a7db398780a2538690781d273f (patch)
treef4801eac43deb00f649670756483377800aa9b48 /sys/lib
parent8e4e1e57303f8eafec8a1ac03670179a39f00b70 (diff)
plumb rules for page, make sam and mothra the default
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/dist/usr/glenda/lib/plumbing3
-rwxr-xr-xsys/lib/newuser3
-rw-r--r--sys/lib/plumb/basic15
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..9f2aacba9 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|x?html?|X?HTML?|epub|EPUB|cb[tz]|CB[TZ])'
arg isfile $0
plumb to postscript
plumb start page -w $file