diff --git a/INSTALL b/INSTALL index 8f123b85..4673056b 100755 --- a/INSTALL +++ b/INSTALL @@ -34,9 +34,9 @@ SunOS) ;; esac -echo "+ Mailing list: http://groups.google.com/group/plan9port-dev" -echo "+ Issue tracker: http://code.swtch.com/plan9port/issues/" -echo "+ Submitting changes: http://swtch.com/go/codereview" +echo "+ Mailing list: https://groups.google.com/group/plan9port-dev" +echo "+ Issue tracker: https://github.com/9fans/plan9port/issues/" +echo "+ Submitting changes: https://github.com/9fans/plan9port/pulls" echo " " echo "* Resetting $PLAN9/config" rm -f config diff --git a/dist/README b/dist/README index eaa28d0d..ba27e51e 100644 --- a/dist/README +++ b/dist/README @@ -7,5 +7,6 @@ mk man recreates the HTML version of the man pages mk push - copies the HTML pages to swtch.com + copies the HTML pages to 9fans.github.io + diff --git a/dist/main.html b/dist/main.html index 47f8b1e0..f0b51911 100644 --- a/dist/main.html +++ b/dist/main.html @@ -6,7 +6,7 @@ Edit ./^$/,s/ - +Plan 9 from User Space @@ -32,9 +32,7 @@ Edit ./^$/,s/
browse | - hg - | - hgweb + github | unix | @@ -76,9 +74,10 @@ Edit ./^$/,s/
- latest tree: plan9port.tgz - (date and checksums; - list of recent changes; + using git: git clone https://github.com/9fans/plan9port plan9 +

+ latest tree: plan9port-master.zip + (list of recent changes; license)

@@ -146,7 +145,7 @@ Edit ./^$/,s/
mailing list (plan9port-dev on Google groups)
- issue tracker (http://code.swtch.com/plan9port/issues/)
+ issue tracker (https://github.com/9fans/plan9port/issues)
Russ Cox (rsc@swtch.com)
@@ -161,7 +160,7 @@ Edit ./^$/,s/
- See http://swtch.com/plan9port/unix/. + See https://9fans.github.io/plan9port/unix/.
@@ -169,7 +168,7 @@ Edit ./^$/,s/
- + An early version of Plan 9 from User Space for Windows. Only for reference. diff --git a/dist/mantrailer.html b/dist/mantrailer.html index 0d49cdc2..f2139004 100644 --- a/dist/mantrailer.html +++ b/dist/mantrailer.html @@ -2,6 +2,6 @@
-Space Glenda +Space Glenda
diff --git a/dist/mkdirlist b/dist/mkdirlist new file mode 100755 index 00000000..8f43fc8a --- /dev/null +++ b/dist/mkdirlist @@ -0,0 +1,7 @@ +#!/usr/local/plan9/bin/rc + +echo '
'
+echo 'Plan 9 from User Space '$2
+echo
+@{cd $1; 9 ls -lF} | 9 sed 's!^(.-......... M 0 )[^ ]+ [^ ]+ (.*) (.*[^*])!\1 glenda sys \2 \3!'
+echo '
' diff --git a/dist/mkfile b/dist/mkfile index e0607146..bbc431e0 100644 --- a/dist/mkfile +++ b/dist/mkfile @@ -9,9 +9,4 @@ man:V: 9 rc ./manweb push:V: - gsutil -m rsync -r -d $PLAN9/man gs://swtch/www/plan9port/man - gsutil cp unix.html gs://swtch/www/plan9port/unix/index.html - gsutil cp main.html gs://swtch/www/plan9port/index.html - gsutil cp ss.html gs://swtch/www/plan9port/screenshots/index.html - # @{cd ../unix/man && mk push} - # @{cd ../unix && mk push} + 9 rc ./publish diff --git a/dist/publish b/dist/publish new file mode 100755 index 00000000..bfad7cae --- /dev/null +++ b/dist/publish @@ -0,0 +1,29 @@ +#!/usr/local/plan9/bin/rc + +dir=$9fansweb +if (~ $#dir 0) { + dir=$home^/pub/9fans.github.io + 9fansweb=$dir +} + +root=$dir/plan9port +if (! test -d $root) { + echo $root does not exist >[1=2] + exit bad +} + +rm -rf $root/man +cp -a ../man $root/man +mkdir -p $root/unix +cp unix.html $root/unix/index.html +cp main.html $root/index.html +cp ss.html $root/screenshots/index.html +@{cd ../unix/man && mk push} +@{cd ../unix && mk push} + +rm -rf $root/../usr/local/plan9 +mkdir -p $root/../usr/local/plan9 +git archive HEAD | @{cd $root/../usr/local/plan9 && u tar xf -} +for(d in `{find $root/../usr/local/plan9 -type d}) { + 9 rc ./mkdirlist $d `{echo $d | sed 's;.*/usr;/usr;'} >t1 && mv t1 $d/index.html +} diff --git a/dist/ss.html b/dist/ss.html index 92076848..5ef2fd1d 100644 --- a/dist/ss.html +++ b/dist/ss.html @@ -6,7 +6,7 @@ Edit ./^$/,s/ - +Plan 9 from User Space - Screen Shots @@ -101,6 +101,7 @@ Edit ./^$/,s/
+
Space Glenda
diff --git a/dist/unix.html b/dist/unix.html index dc95c3d8..0e8394c2 100644 --- a/dist/unix.html +++ b/dist/unix.html @@ -6,7 +6,7 @@ Edit ./^$/,s/ - +Unix Software from Plan 9 diff --git a/man/man1/git.1 b/man/man1/git.1 index b7e111f5..9b29b512 100644 --- a/man/man1/git.1 +++ b/man/man1/git.1 @@ -1,10 +1,10 @@ .TH GIT 1 .SH NAME -git, hg, cvs \- introduction to using plan9port Git repository +git, hg, cvs, codereview \- introduction to using plan9port Git repository .SH SYNOPSIS .B git .B clone -.B http://code.swtch.com/plan9port +.B https://9fans.github.io/plan9port .B plan9 .PP .B git @@ -20,12 +20,10 @@ git, hg, cvs \- introduction to using plan9port Git repository .B gitk .PP .B web -.B http://code.swtch.com/plan9port +.B https://9fans.github.io/plan9port .SH DESCRIPTION The master source tree for Plan 9 from User Space is maintained -using the source control system Git -as a substitute for Plan 9's -\fIreplica\fR(8) and dump file system. +using the source control system Git. .PP The first argument to .I git @@ -68,7 +66,7 @@ refers to the most recent version in the version history. starts an interactive history viewer. .PP The Git tree can be inspected on the web at -.HR http://code.swtch.com/plan9port/ "" . +.HR https://github.com/9fans/plan9port "" . .SH FILES .TP .B \*9/.git @@ -77,13 +75,11 @@ directory containing Git local repository .B .gitignore list of files and wildcards to exclude from Git operations .SH SEE ALSO -.IR codereview (1) -.PP Unix's \fIgit\fR(1), .HR http://git-scm.com/doc .PP -.HR http://code.swtch.com/plan9port/ +.HR https://9fans.github.io/plan9port/ .SH BUGS Plan 9 from User Space is no longer accessible using CVS or Mercurial; you must use Git. diff --git a/man/man1/install.1 b/man/man1/install.1 index 574bdc5c..be35bd35 100644 --- a/man/man1/install.1 +++ b/man/man1/install.1 @@ -17,7 +17,7 @@ To obtain the Plan 9 tree, use Git (see .IR git (1)) or download a tar file from -.HR http://swtch.com/plan9port "" . +.HR https://9fans.github.io/plan9port "" . .PP The tree can be unpacked anywhere, but the usual place is diff --git a/src/cmd/awk/README b/src/cmd/awk/README index bcf46126..e3efb50d 100644 --- a/src/cmd/awk/README +++ b/src/cmd/awk/README @@ -6,7 +6,7 @@ as such, it's copyright is held by Lucent Technologies and distributed under the Lucent Public License version 1.02 [http://www.opensource.org/licenses/lucent1.02.php]. Modifications were made by Jeff Sickel in order to build using Plan 9 from User -Space [http://swtch.com/plan9port/] to the following files: +Space [https://9fans.github.io/plan9port/] to the following files: mkfile re.c diff --git a/unix/README b/unix/README index 602ee262..827982ec 100644 --- a/unix/README +++ b/unix/README @@ -1,5 +1,5 @@ This software was packaged for Unix by Russ Cox. Please send comments to rsc@swtch.com. -http://swtch.com/plan9port/unix +https://9fans.github.io/plan9port/unix diff --git a/unix/man/bio.3 b/unix/man/bio.3 index 3b8da2fa..0bc06e15 100644 --- a/unix/man/bio.3 +++ b/unix/man/bio.3 @@ -321,7 +321,7 @@ When reading, this is the number of bytes still available from the last read on the file; when writing, it is the number of bytes ready to be written. .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH SEE ALSO .IR open (2), .IR print (3), diff --git a/unix/man/fixurls b/unix/man/fixurls index e058b147..8c348477 100755 --- a/unix/man/fixurls +++ b/unix/man/fixurls @@ -24,7 +24,7 @@ for($i=0; $i<@ARGV; $i++){ } $text =~ s!../man(.)/([^.]*)\.html!$2$1.html!g; - $text =~ s!(http://swtch.com/plan9port/unix)!\1!g; + $text =~ s!(https://9fans.github.io/plan9port/unix)!\1!g; open(OUT, ">$ARGV[$i]") || die "open $ARGV[$i]: $!"; print OUT $text; diff --git a/unix/man/fmtinstall.3 b/unix/man/fmtinstall.3 index 13007d2a..ccca7fba 100644 --- a/unix/man/fmtinstall.3 +++ b/unix/man/fmtinstall.3 @@ -362,7 +362,7 @@ main(...) } .EE .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH SEE ALSO .IR print (3), .IR utf (7) diff --git a/unix/man/fmtstrtod.3 b/unix/man/fmtstrtod.3 index e2b1caef..c3894124 100644 --- a/unix/man/fmtstrtod.3 +++ b/unix/man/fmtstrtod.3 @@ -44,7 +44,7 @@ Therefore, it may be necessary to back up the input stream one character after calling .IR fmtcharstod . .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH SEE ALSO .IR fscanf (3) .SH DIAGNOSTICS diff --git a/unix/man/isalpharune.3 b/unix/man/isalpharune.3 index ecad654c..522e82b8 100644 --- a/unix/man/isalpharune.3 +++ b/unix/man/isalpharune.3 @@ -43,7 +43,7 @@ The names are self-explanatory. .PP The case-conversion routines return the character unchanged if it has no case. .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH "SEE ALSO .IR isalpha (3) , .IR "The Unicode Standard" . diff --git a/unix/man/mk.1 b/unix/man/mk.1 index b1eb25f5..abc8d669 100644 --- a/unix/man/mk.1 +++ b/unix/man/mk.1 @@ -648,7 +648,7 @@ x.tab.h:Pcmp -s: y.tab.h cp y.tab.h x.tab.h .EE .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH SEE ALSO .IR sh (1), .IR regexp9 (7) diff --git a/unix/man/mkfile b/unix/man/mkfile index 918aff8a..b80e2e18 100644 --- a/unix/man/mkfile +++ b/unix/man/mkfile @@ -31,4 +31,4 @@ MKSHELL=$PLAN9/bin/rc ./fixurls $target push:V: - rsync -e ssh -t *.html swtch:www/swtch.com/plan9port/unix/man + cp *.html $9fansweb/plan9port/unix/man diff --git a/unix/man/print.3 b/unix/man/print.3 index 06241398..f96df06e 100644 --- a/unix/man/print.3 +++ b/unix/man/print.3 @@ -426,7 +426,7 @@ void fatal(char *msg, ...) } .EE .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH SEE ALSO .IR fmtinstall (3), .IR fprintf (3), diff --git a/unix/man/quote.3 b/unix/man/quote.3 index dfeb2597..63f99bbb 100644 --- a/unix/man/quote.3 +++ b/unix/man/quote.3 @@ -143,7 +143,7 @@ for example the printed string will always be quoted; otherwise quotes will only be provided if necessary to avoid ambiguity. .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH "SEE ALSO .IR rc (1), .IR malloc (3), diff --git a/unix/man/regexp9.3 b/unix/man/regexp9.3 index ce9de14c..96ee03c3 100644 --- a/unix/man/regexp9.3 +++ b/unix/man/regexp9.3 @@ -194,7 +194,7 @@ fields of the .I match array elements should be used. .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH "SEE ALSO" .IR grep (1) .SH DIAGNOSTICS diff --git a/unix/man/rune.3 b/unix/man/rune.3 index 36873db9..4e3b44a2 100644 --- a/unix/man/rune.3 +++ b/unix/man/rune.3 @@ -180,7 +180,7 @@ is the null string, returns .IR s1 . .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH SEE ALSO .IR utf (7), .IR tcs (1) diff --git a/unix/man/runestrcat.3 b/unix/man/runestrcat.3 index 31db54f3..d338f6be 100644 --- a/unix/man/runestrcat.3 +++ b/unix/man/runestrcat.3 @@ -58,7 +58,7 @@ These functions are rune string analogues of the corresponding functions in .IR strcat (3). .SH SOURCE -.B http://swtch.com/plan9port/unix +.B https://9fans.github.io/plan9port/unix .SH SEE ALSO .IR rune (3), .IR strcat (3) diff --git a/unix/mkfile b/unix/mkfile index d05b297c..245ea2ed 100644 --- a/unix/mkfile +++ b/unix/mkfile @@ -64,7 +64,9 @@ mk-with-libs.tgz:V: tgz:V: libutf.tgz libfmt.tgz libregexp9.tgz libbio.tgz mk.tgz mk-with-libs.tgz -push: - rsync -e ssh -t *.tgz swtch.com:www/swtch.com/plan9port/unix - ssh swtch.com rm -f www/swtch.com/plan9port/unix/*.sha1 \ - www/swtch.com/plan9port/unix/*.md5 +push:V: + rm -f *.sha1 *.md5 *.sha256 + for (i in *.tgz) + sha1sum $i >$i.sha1 + cp *.tgz $9fansweb/plan9port/unix + cp *.tgz.sha1 $9fansweb/plan9port/unix