hlfw.ca

Info  •  Files  •  Log  •  Branches

Update 9fs entries, other cleanup

--- a/9fs

+++ b/9fs

@@ -7,10 +7,27 @@

 	rm /srv/work

 switch($1){

-case altid

-	bind $home/alt /mnt/work

+case altd/*

+	repo=`{echo $1 | sed 's/alt\///'}

+	bind /usr/glenda/src/altd.ca/$repo /mnt/work

+case hlfw/*

+	repo=`{echo $1 | sed 's/hlfw\///'}

+	bind /usr/glenda/src/hlfw.ca/$repo /mnt/work

 case rc

-	bind $home/bin/rc /mnt/work

+	bind /usr/glenda/src/hlfw.ca/cli/rc /mnt/work

+case drawcpu

+	bind /usr/glenda/src/hlfw.ca/extra/drawcpu /mnt/work

+case tasks

+	bind /usr/glenda/src/hlfw.ca/extra/task /mnt/work

+case hlfw.ca

+	bind /usr/glenda/src/hlfw.ca/site/hlfw /mnt/work

+case atld.ca

+	bind /usr/glenda/src/altd.ca/site/altd /mnt/work

+case wm

+	bind /usr/glenda/src/hlfw.ca/wm /mnt/work

+case cc-*

+	srv tcp!fs!9fs work/$1 $1

+	mount /srv/$1 /mnt/work

 }

 if(ns | grep /mnt/work >/dev/null)

--- a/pmenu

+++ /dev/null

@@ -1,7 +1,0 @@

-#!/bin/rc

-rfork e

-

-exec window 'ls $home/lib/namespace* | sed s/.*namespace\.// | smenu -i | {

-	proj -i -p notify

-	echo delete >/mnt/wsys/wctl

-}'

--- a/riostart

+++ b/riostart

@@ -7,7 +7,7 @@

 	window -r 0 0 140 128 'stats -melzs'

 	window -r 0 128 140 256 'stats -melzs authy'

 	window -r 0 256 140 384 'stats -melzs fs'

-	window -r 0 384 140 512 'stats -melzs prox'

+	window -r 0 384 140 512 'stats -melzs proxy'

 	window -r 0 512 140 640 'stats -melzs altd'

 	window -r 0 640 140 768 'stats -melzs hlfw'

 	window -r 140 0 753 768 'rcpu -h hlfw -c tail -f /sys/log/httpd'

--- a/wm

+++ b/wm

@@ -1,7 +1,6 @@

 #!/bin/rc

 aux/acpi

-done=0

 fn sigint {

 	pid=`{cat /tmp/wm.pid}

@@ -8,15 +7,18 @@

 	echo kill >/proc/$pid/ctl

 }

-mount /srv/plumb /mnt/plumb

+fn sigkill {

+	pid=`{cat /tmp/wm.pid}

+	echo kill >/proc/$pid/ctl

+}

+mount /srv/plumb /mnt/plumb

 touch /tmp/wm.proj /tmp/wm.pid

 echo '○ │ ○ │  ○ │ ○ │ ○ │ ○' > /tmp/wm.tags

 </dev/kbdtap ktrans -G | 9hkd -t  >/dev/kbdtap |[3] {

 	{

-		cat /mnt/plumb/notify | while(~ $done 0){

-			cmd=`{read}

+		cat /mnt/plumb/notify | while(cmd=`{read}){

 			port=`{read}

 			usr=`{read}

 			text=`{read}

@@ -36,7 +38,7 @@

 			echo $tags > /tmp/wm.tags

 			echo $proj $tags

 		}

-		done=1

+		echo kill > /proc/$apid/ctl

 	}

 }| bar -p bottom | dropbar

--- a/wmenu

+++ b/wmenu

@@ -1,7 +1,6 @@

 #!/bin/rc

 rfork ne

-if(! test -f /srv/work)

-	exit 'no workspace'

+ls /srv/ns.* >/dev/null || exit 'no workspace'

 exec window -m 'workfile'

--- a/workfile

+++ b/workfile

@@ -1,16 +1,13 @@

 #!/bin/rc

 rfork ne

-notouch=0

-if(ns | grep /mnt/work >/dev/null)

-	notouch++

-if not

-	mount /srv/work /mnt/work

+pro=`{cat /tmp/wm.pro}

+ns | grep -s /mnt/work || mount /srv/ns.$pro /mnt/work

-res=`{walk /mnt/work | grep -v .git | fm -p}

-echo $res

+res=`{walk -u -f /mnt/work | grep -v .git | fm -p}

 if(! ~ $#res 0){

 	mount /srv/plumb /mnt/plumb

 	plumb $res

 }

+

 echo delete >/mnt/wsys/wctl