shithub: rc

Download patch

ref: 7bbebaa711969f7bb108ebe1adc05fcda77b5f49
parent: e367d85b395cd3d0eef97f70d535b0c8af1f670f
author: qwx <qwx@sciops.net>
date: Sun Mar 6 06:11:47 EST 2022

use bof(1) in place of rio(1) and cleanup

--- a/bin/9grid
+++ b/bin/9grid
@@ -11,6 +11,6 @@
 #window -r 1589 109 1910 182 holdchat
 !
 chmod +x /tmp/grid.$pid
-rio -i /tmp/grid.$pid
+bof -i /tmp/grid.$pid
 rm /tmp/grid.$pid
 unmount /n/chat
--- a/bin/9grid.old
+++ b/bin/9grid.old
@@ -11,7 +11,7 @@
 #bind -c /n/ftp/incoming /n/gridftp
 
 unmount /mnt/plumb
-rio -k '
+bof -k '
 window -scroll chat -n qwx
 window -scroll girc -g /n/chat/chat
 ' || status=''
--- a/bin/cinrio
+++ b/bin/cinrio
@@ -3,6 +3,6 @@
 font=/n/ttf/unifont.ttf.16/font
 plumber -s plumb.$pid
 plumbsrv=()
-rio
+bof
 unmount /mnt/plumb
 rm /srv/plumb.$pid
--- a/bin/cpurio
+++ b/bin/cpurio
@@ -5,30 +5,10 @@
 	echo hwaccel on >'#v/vgactl'
 }
 rfork efns	# weeeee
-font=/lib/font/bit/uga.font
 bind -a '#A' /dev
-bind -c $home/tmp /tmp
-bind -a $home/bin/rc /bin
-bind -a $home/bin/$cputype /bin
-test -f $home/p/rc/bin/bindbins && . $home/p/rc/bin/bindbins
+service=terminal
 if(test -f $home/lib/ass){
 	auth/factotum
 	setec
 }
-webcookies
-webfs
-plumber
-switch($sysname){
-case w500
-	echo pin 22 >'#A'/audioctl
-	echo inpin 23 >'#A'/audioctl
-case hsw
-	echo pin 27 >'#A/audioctl'
-	echo inpin 25 >'#A'/audioctl
-}
-if(! ~ $sysname aib)
-	echo master 40 >'#A/volume'
-echo accelerated 3 >'#m'/mousectl
-prompt=('; ' '	')
-rio -i riostart
-# might be nice to do dontkill '^(rio|rc)$'
+. $home/lib/profile
--- a/bin/mailrio
+++ b/bin/mailrio
@@ -21,7 +21,7 @@
 window -r $facerect faces -i
 !
 chmod +x /tmp/mailrio.$pid
-rio -i /tmp/mailrio.$pid
+bof -i /tmp/mailrio.$pid
 rm /tmp/mailrio.$pid
 unmount /mail/fs
 unmount /mnt/plumb
--- a/bin/mku
+++ b/bin/mku
@@ -28,7 +28,6 @@
 	play-dmid-mod\
 	play-opus-aac\
 	png-maxmem\
-	rio-exit\
 	troff-nchars\
 	vgadb-w500-w520\
 	acme-col\
@@ -38,7 +37,6 @@
 	faces-col\
 	fplot-col\
 	mothra-col\
-	rio-col\
 	samterm-col\
 	spred-col\
 	stats-col\
@@ -49,7 +47,6 @@
 	vt-col\
 	zuke-col\
 )\
-	$extra/usr/sigrid/^(riow/9front.diff)\
 )
 more=(\
 	$extra/usr/^(spew/aplay sigrid/imgtools sigrid/mp3dec)\
--- a/bin/mw
+++ b/bin/mw
@@ -32,5 +32,5 @@
 }
 ' $home/lib/mbox >/tmp/mw.$pid
 chmod +x /tmp/mw.$pid
-rio -i /tmp/mw.$pid
+bof -i /tmp/mw.$pid
 rm /tmp/mw.$pid
--- a/bin/pasteldiff
+++ b/bin/pasteldiff
@@ -1,8 +1,9 @@
 #!/bin/rc -e
 git
 cd /
-rm -f /sys/src/cmd/rio/menuhit.c* /sys/src/cmd/rio/col.h*
-git/revert /sys/src/^(libdraw games/sudoku cmd/^(acme colors.c faces fplot.c kbmap.c mothra spred stats.c aux/status* vt winwatch.c audio/zuke rio))
+
+
+git/revert /sys/src/^(libdraw games/sudoku cmd/^(acme colors.c faces fplot.c kbmap.c mothra spred stats.c aux/status* vt winwatch.c audio/zuke))
 exit nope: deprecated patch
 pa4 $home/p/patch/^(\
 	libdraw-pastelmenucol\
@@ -15,7 +16,6 @@
 cd /sys/src/libdraw && mk nuke && mk install && mk clean
 cd /
 mkdir -p /tmp/bin/^(aux games audio)
-cd /sys/src/cmd/rio && mk && mv 6.out /tmp/bin/rio && mk clean
 cd /sys/src/cmd/mothra && mk && mv 6.out /tmp/bin/aux/mothra && mk nuke
 cd /sys/src/cmd/acme && mk && mv 6.out /tmp/bin/acme && mk clean
 cd /sys/src/cmd/faces && mk && mv 6.out /tmp/bin/faces && mk clean
@@ -37,4 +37,4 @@
 cd /sys/lib/extra/usr/spew/aplay && mk 6.volume && mv 6.volume /tmp/bin/volume && mk clean
 cd /sys/lib/extra/usr/sigrid/bar && mk 6.bar && mv 6.bar /tmp/bin/bar && mk clean
 dircp /tmp/bin /usr/qwx/pastel
-git/revert /sys/src/^(libdraw games/sudoku cmd/^(acme colors.c faces fplot.c kbmap.c mothra spred stats.c aux/status* vt winwatch.c audio/zuke rio))
+git/revert /sys/src/^(libdraw games/sudoku cmd/^(acme colors.c faces fplot.c kbmap.c mothra spred stats.c aux/status* vt winwatch.c audio/zuke))
--- a/bin/pastels
+++ b/bin/pastels
@@ -2,5 +2,5 @@
 d=$home/pastel
 if(~ $1 -2)
 	d=$home/pastel2
-for(i in acme bar colors faces fplot kbmap mothra rio spred stats vt winwatch aux/^(jamterm statusmsg statusbar) games/sudoku audio/zuke volume vdir)
+for(i in acme bar colors faces fplot kbmap mothra spred stats vt winwatch aux/^(jamterm statusmsg statusbar) games/sudoku audio/zuke volume vdir)
 	bind $d/$i /bin/$i
--- a/bin/riostart
+++ b/bin/riostart
@@ -18,5 +18,5 @@
 		/⏷/{system("v-")}
 	'' >[2]/dev/null
 }; riow'
-sleep 1
+themeset
 window -scroll -r $cmdrect 'label cmd; rc'
--- a/bin/rsam
+++ b/bin/rsam
@@ -36,7 +36,7 @@
 cat <<! >/env/fuckrc
 unmount /mnt/plumb
 plumber
-rio -k '
+bof -k '
 	window -r $rw -scroll
 	window -r $rs jam -a $* $f
 '
--- a/bin/themeset
+++ b/bin/themeset
@@ -1,5 +1,7 @@
 #!/bin/rc -e
-cat $home/lib/theme/rio >/mnt/wsys/theme
+if(! test -f $home/lib/theme/rio)
+	exit
+cp $home/lib/theme/rio /mnt/wsys/theme
 sleep 0.5
 grep softscreen /dev/vgactl >>/dev/vgactl
 echo hwblank off >>/dev/vgactl
--- a/bin/ufo
+++ b/bin/ufo
@@ -3,4 +3,4 @@
 srv tcp!plan-nue.youkai.pw!4458 ufo /n/ufo
 rm /srv/ufo
 audio/mixfs
-rio -k 'window ''echo ''''pump -k 51200 -b 131072 </n/ufo/radio | audio/mp3dec >/dev/audio''''; rc'''
+bof -k 'window ''echo ''''pump -k 51200 -b 131072 </n/ufo/radio | audio/mp3dec >/dev/audio''''; rc'''
--- a/bin/vncrio
+++ b/bin/vncrio
@@ -1,24 +1,19 @@
 #!/bin/rc
 rfork nefs
-font=/lib/font/bit/uga.font
-bind -c $home/tmp /tmp
-bind -a $home/bin/rc /bin
-bind -a $home/bin/$cputype /bin
-test -f $home/p/rc/bin/bindbins && . $home/p/rc/bin/bindbins
+service=terminal
+norio=1
 if(test -f $home/lib/ass){
 	auth/factotum
 	setec
 }
-webcookies
-webfs
-plumber
-echo accelerated 5 >'#m'/mousectl
-prompt=('; ' '	')
-rio -k '
-	window -r 586 0 1280 584 9grid
-	#window -r 0 0 732 602 mw
-	#window -scroll -r 0 324 612 806 wii
-	window -scroll -r 607 749 1280 800 girc ''/tmp/irc.irc.oftc.net!#cat-v''
-	window stats -lmse
-	window ''label wii; echo wii; rc''
-'
+. $home/lib/profile
+cat <<! >/tmp/bof.$pid
+#!/bin/rc
+window -r 586 0 1280 584 9grid
+window -scroll -r 607 749 1280 800 girc '/tmp/irc.irc.oftc.net!#cat-v'
+window stats -lmse
+window 'label wii; echo wii; rc'
+!
+chmod +x /tmp/bof.$pid
+bof -i /tmp/bof.$pid
+rm /tmp/bof.$pid
--- a/bin/work/ger
+++ b/bin/work/ger
@@ -16,7 +16,7 @@
 window -r $duckrect 'mothra http://dict.cc'
 !
 chmod +x /tmp/work.$pid
-rio -i /tmp/work.$pid
+bof -i /tmp/work.$pid
 rm /tmp/work.$pid
 
 unmount /mnt/plumb
--- a/bin/work/monitoring
+++ b/bin/work/monitoring
@@ -14,7 +14,7 @@
 window -r $cmdrect tx kekw
 !
 chmod +x /tmp/work.$pid
-rio -i /tmp/work.$pid
+bof -i /tmp/work.$pid
 rm /tmp/work.$pid
 
 unmount /mnt/plumb
--- a/bin/work/music
+++ b/bin/work/music
@@ -15,7 +15,7 @@
 window -scroll -r $zukerect 'label zuke; rc'
 !
 chmod +x /tmp/work.$pid
-rio -i /tmp/work.$pid
+bof -i /tmp/work.$pid
 rm /tmp/work.$pid
 
 unmount /mnt/plumb
--- a/bin/work/proj
+++ b/bin/work/proj
@@ -24,7 +24,7 @@
 window -r $bsamrect jam -a $f
 !
 chmod +x /tmp/work.$pid
-rio -i /tmp/work.$pid
+bof -i /tmp/work.$pid
 
 rm /tmp/work.$pid
 unmount /mnt/plumb
--- a/bin/work/social
+++ b/bin/work/social
@@ -11,7 +11,7 @@
 window -r $vncrect v aib
 !
 chmod +x /tmp/work.$pid
-rio -i /tmp/work.$pid
+bof -i /tmp/work.$pid
 
 rm /tmp/work.$pid
 unmount /mnt/plumb
--- a/bin/work/stream
+++ b/bin/work/stream
@@ -24,7 +24,7 @@
 window -r $bsamrect jam -a $f
 !
 chmod +x /tmp/work.$pid
-rio -i /tmp/work.$pid
+bof -i /tmp/work.$pid
 
 rm /tmp/work.$pid
 unmount /mnt/plumb
--- a/bin/work/work
+++ b/bin/work/work
@@ -24,7 +24,7 @@
 window -r 4 4 783 1178 tx $m
 !
 chmod +x /tmp/work.$pid
-rio -i /tmp/work.$pid
+bof -i /tmp/work.$pid
 rm /tmp/work.$pid
 
 unmount /n/ssh