diff options
author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-09-28 11:20:22 +0200 |
---|---|---|
committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-09-28 11:20:22 +0200 |
commit | ed9342b2a15fcb98a5e1641b291b9d51f00538e8 (patch) | |
tree | fae6678eac643e3b220ac1cf5529a81f780fe475 /dist | |
parent | 3792be8ab8fe8253fa4758a646963eb7fb95b390 (diff) | |
parent | 3f8ac29339ad67f05d32064fcc810035d55a3985 (diff) | |
download | plan9port-ed9342b2a15fcb98a5e1641b291b9d51f00538e8.tar.gz plan9port-ed9342b2a15fcb98a5e1641b291b9d51f00538e8.tar.bz2 plan9port-ed9342b2a15fcb98a5e1641b291b9d51f00538e8.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'dist')
-rw-r--r-- | dist/.cvsignore | 2 | ||||
-rw-r--r-- | dist/README | 3 | ||||
-rw-r--r-- | dist/debian/.cvsignore | 22 | ||||
-rw-r--r-- | dist/main.html | 19 | ||||
-rw-r--r-- | dist/mantrailer.html | 2 | ||||
-rwxr-xr-x | dist/mkdirlist | 7 | ||||
-rw-r--r-- | dist/mkfile | 7 | ||||
-rwxr-xr-x | dist/publish | 29 | ||||
-rw-r--r-- | dist/ss.html | 4 | ||||
-rw-r--r-- | dist/unix.html | 2 |
10 files changed, 53 insertions, 44 deletions
diff --git a/dist/.cvsignore b/dist/.cvsignore deleted file mode 100644 index e12a058c..00000000 --- a/dist/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -check.out -filelist 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/debian/.cvsignore b/dist/debian/.cvsignore deleted file mode 100644 index d315cd6c..00000000 --- a/dist/debian/.cvsignore +++ /dev/null @@ -1,22 +0,0 @@ -base -bin -devel -dict -dists -faces -font-asian -font-bh -font-core -font-proof -lib -lp -main -minimal -pool -postscript -postscript-bh -sky -sky-data -src -troff -unixdist 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/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g --> <head> -<base href="http://swtch.com/plan9port/"> +<base href="https://9fans.github.io/plan9port/"> <title>Plan 9 from User Space</title> </head> <body bgcolor=#ffffff> @@ -32,9 +32,7 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g | <a href="/usr/local/plan9/">browse</a> | - <a href="man/man1/hg.html">hg</a> - | - <a href="http://code.swtch.com/plan9port">hgweb</a> + <a href="https://github.com/9fans/plan9port">github</a> | <a href="unix/">unix</a> | @@ -76,9 +74,10 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g <table border=0 cellspacing=0 cellpadding=0 width=100%> <tr height=10><td width=20><td> <tr><td><td> - latest tree: <a href="plan9port.tgz">plan9port.tgz</a> - <font size=-1>(<a href="/cgi-bin/info.cgi?file=/plan9port/plan9port.tgz">date and checksums</a>; - <a href="http://code.swtch.com/plan9port/commits/all">list of recent changes</a>; + using git: <code>git clone https://github.com/9fans/plan9port plan9</code> + <p> + latest tree: <a href="https://github.com/9fans/plan9port/archive/master.zip">plan9port-master.zip</a> + <font size=-1>(<a href="https://github.com/9fans/plan9port/commits/master">list of recent changes</a>; <a href="/usr/local/plan9/LICENSE">license</a>)</font> <br> </table> @@ -146,7 +145,7 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g <tr height=10><td width=20><td> <tr><td><td> mailing list <font size=-1>(<a href="http://groups.google.com/group/plan9port-dev">plan9port-dev on Google groups</a>)</font><br /> - issue tracker <font size=-1>(<a href="http://code.swtch.com/plan9port/issues/">http://code.swtch.com/plan9port/issues/</a>)</font><br /> + issue tracker <font size=-1>(<a href="https://github.com/9fans/plan9port/issues">https://github.com/9fans/plan9port/issues</a>)</font><br /> Russ Cox <font size=-1>(<a href="mailto:rsc@swtch.com">rsc@swtch.com</a>)</font><br /> </table> @@ -161,7 +160,7 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g <table border=0 cellspacing=0 cellpadding=0 width=100%><tr height=10><td></table> - See <a href="http://swtch.com/plan9port/unix/">http://swtch.com/plan9port/unix/</a>. + See <a href="/plan9port/unix/">https://9fans.github.io/plan9port/unix/</a>. </table> <table border=0 cellspacing=0 cellpadding=0 width=100%><tr height=20><td></table> @@ -169,7 +168,7 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g <table border=0 cellspacing=0 cellpadding=0 width=100%> <tr height=10><td width=20><td> <tr><td><td> - <a href="http://swtch.com/usr/local/plan9/9pm/README"> + <a href="https://9fans.github.io/usr/local/plan9/9pm/README"> An early version </a> 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 @@ <tr height=15><td width=10><td><td width=10> <tr><td><td> <center> -<a href="http://swtch.com/plan9port/"><img src="../../dist/glendacircle.png" alt="Space Glenda" border=0></a> +<a href="https://9fans.github.io/plan9port/"><img src="../../dist/glendacircle.png" alt="Space Glenda" border=0></a> </center> </table> 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 '<pre>' +echo '<a href="/plan9port">Plan 9 from User Space</a> '$2 +echo +@{cd $1; 9 ls -lF} | 9 sed 's!^(.-......... M 0 )[^ ]+ [^ ]+ (.*) (.*[^*])!\1 glenda sys \2 <a href='\3'>\3</a>!' +echo '</pre>' 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..a9b50b88 --- /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 +@{cd ..; 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/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g --> <head> -<base href="http://swtch.com/plan9port/screenshots/"> +<base href="https://9fans.github.io/plan9port/screenshots/"> <title>Plan 9 from User Space - Screen Shots</title> </head> <body bgcolor=#ffffff> @@ -101,6 +101,7 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g </table> </center> + <!-- <center> <font size=-1> Submissions welcomed. @@ -108,6 +109,7 @@ Edit ./^$/,s/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g (<a href="mailto:rsc@swtch.com">rsc@swtch.com</a>). </font> </center> + --> <tr height=20><td> <tr><td><td><center><a href=".."><img src="../dist/spaceglenda100.png" border=1 alt="Space Glenda"></a></center> 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/<Table/<table border=0 cellspacing=0 cellpadding=0 width=100%/g --> <head> -<base href="http://swtch.com/plan9port/unix/"> +<base href="https://9fans.github.io/plan9port/unix/"> <title>Unix Software from Plan 9</title> </head> <body bgcolor=#ffffff> |