Re: http://www.openbsd.org/anoncvs.html
Ray Lai <[email protected]>
| Newsgroups | gmane.os.openbsd.www |
|---|---|
| Message-ID | <[email protected]> |
On Sun, Feb 19, 2006 at 12:32:26PM +0100, steven mestdagh wrote: > On Wed, Feb 15, 2006 at 11:29:36AM -0500, Ray Lai wrote: > > On Wed, Feb 15, 2006 at 04:41:33PM +0100, Arndt Stajta wrote: > > > I tried to use this command > > > setenv CVSROOT [email protected]:/cvs > > > which is described on the website. > > > > > > but the shell answers: > > > ksh: setenv: not found > > > > > > then i used google and tried export > > > [email protected]:/cvs > > > > > > an then everything works fine. > > > > > > probably I made a mistake? > > > > The examples were written for csh. By default all accounts use ksh > > now, so I've changed all csh syntax to ksh. I also tried to be > > shell-agnostic, unless setting an environment variable is necessary > > for the example. > > I agree these docs should be somewhat fixed in favour of ksh, but I'm > not sure taking out CVSROOT and using the -d option everywhere is the > right thing to do? Maybe the export CVSROOT stuff should not be around > for every example, but we could suggest to set it in ~/.profile or such. > Nick, what do you think about this? > Also some consistency fixes may be in order, sometimes we are using -q, > sometimes we aren't,... > > > The PKG_PATH example is just silly. The preceding paragraph describes > > setting PKG_PATH to simplify pkg_add, then proceeds to use $PKG_PATH. > > I fixed this a few days ago, thanks! Here are the same changes as before, minus the PKG_PATH stuff Steven committed. Even if we don't change the examples to be shell-agnostic, they should not be in csh. I will supply a ksh diff if that is desired. Comments? Okay? -Ray- Index: anoncvs.html =================================================================== RCS file: /cvs/www/anoncvs.html,v retrieving revision 1.244 diff -u -r1.244 anoncvs.html --- anoncvs.html 31 Jan 2006 16:42:06 -0000 1.244 +++ anoncvs.html 13 Mar 2006 19:08:29 -0000 @@ -460,13 +460,13 @@ <p> A sample use of an anoncvs server would be: <pre> -% <strong>setenv CVSROOT [email protected]:/cvs</strong> -% <strong>cd /tmp</strong> -% <strong>cvs get src/sys/arch/sparc</strong> +$ <strong>cd /tmp</strong> +$ <strong>cvs -d [email protected]:/cvs get src/sys/arch/sparc</strong> [copies the files from the repository to your machine] -% <strong>cvs log src/sys/arch/sparc/sparc/locore.s</strong> +$ <strong>cd src/sys/arch/sparc</strong> +$ <strong>cvs log locore.s</strong> [shows the commit log for the chosen file] -% <strong>cvs diff -bc -r1.1 -r1.5 src/sys/arch/sparc/sparc/locore.s</strong> +$ <strong>cvs diff -bc -r1.1 -r1.5 locore.s</strong> [shows the changes between revisions 1.1 and rev 1.5] </pre> @@ -475,8 +475,7 @@ instead of using ssh or rsh) you must login once:</a> <pre> -% <strong>setenv CVSROOT :pserver:[email protected]:/cvs</strong> -% <strong>cvs login</strong> +$ <strong>cvs -d :pserver:[email protected]:/cvs login</strong> (Logging in to [email protected]) CVS password: <strong>anoncvs</strong> [This writes a line to ~/.cvspass (filename over-ridden by CVS_PASSFILE).] @@ -484,7 +483,7 @@ [password is: ] [:pserver:[email protected]:/cvs Au'yc ] [After logging in ONCE every other use of the above CVSROOT will work. ] -% <strong>cvs get ksrc-i386 ksrc-common</strong> +$ <strong>cvs -d :pserver:[email protected]:/cvs get ksrc-i386 ksrc-common</strong> [Allows you to retrieve ONLY that necessary to rebuild an i386 kernel. ] </pre> @@ -495,16 +494,14 @@ <p> (If you are following <i>current</i>): <pre> - # <strong>setenv CVSROOT [email protected]:/cvs</strong> # <strong>cd /usr</strong> - # <strong>cvs -q get -P src</strong> + # <strong>cvs -qd [email protected]:/cvs get -P src</strong> </pre> <p> (If you are following the patch branch for 3.8): <pre> - # <strong>setenv CVSROOT [email protected]:/cvs</strong> # <strong>cd /usr</strong> - # <strong>cvs -q get -rOPENBSD_3_8 -P src</strong> + # <strong>cvs -qd [email protected]:/cvs get -rOPENBSD_3_8 -P src</strong> </pre> <li> Anytime afterwards, to `update' this tree: @@ -528,10 +525,10 @@ <li> NOTE: If you are updating a source tree that you initially fetched from a different server, or from a CD, you <strong>must</strong> -add the <em>-d $CVSROOT</em> options to cvs. +add the <em>-d [email protected]:/cvs</em> options to cvs. <pre> # <strong>cd /usr/src</strong> - # <strong>cvs -d $CVSROOT -q up -Pd</strong> + # <strong>cvs -d [email protected]:/cvs -q up -Pd</strong> </pre> </ul> @@ -540,15 +537,13 @@ <ul><li> <p> (If you are following <i>current</i>): <pre> - # <strong>setenv CVSROOT [email protected]:/cvs</strong> # <strong>cd /usr</strong> - # <strong>cvs -q get -P ports</strong> + # <strong>cvs -qd [email protected]:/cvs get -P ports</strong> </pre> <p> (If you are following the patch branch for 3.8): <pre> - # <strong>setenv CVSROOT [email protected]:/cvs</strong> # <strong>cd /usr</strong> - # <strong>cvs -q get -rOPENBSD_3_8 -P ports</strong> + # <strong>cvs -qd [email protected]:/cvs get -rOPENBSD_3_8 -P ports</strong> </pre> <li> Anytime afterwards, to `update' this tree: <p> (If you are following <i>current</i>): @@ -662,7 +657,7 @@ do this: <pre> - <strong>% setenv CVS_CLIENT_PORT -1</strong> + <strong>$ export CVS_CLIENT_PORT=-1</strong> </pre> <p> Index: cvsup.html =================================================================== RCS file: /cvs/www/cvsup.html,v retrieving revision 1.97 diff -u -r1.97 cvsup.html --- cvsup.html 13 Dec 2005 17:36:47 -0000 1.97 +++ cvsup.html 13 Mar 2006 19:08:30 -0000 @@ -150,18 +150,10 @@ </a></h3> <p> -It is now simple to check out any one of the CVSup'ed repositories. -For Korn/Bourne shells: +It is now simple to check out any one of the CVSup'ed repositories: <pre> # cd /usr - # CVSROOT=/cvs cvs checkout src -</pre> -<p> -For csh and its derivatives: -<pre> - # cd /usr - # setenv CVSROOT /cvs - # cvs checkout src + # cvs -d /cvs checkout src </pre> <p> @@ -171,7 +163,7 @@ For example: <pre> # cd /usr - # cvs checkout -rOPENBSD_3_7 src + # cvs -d /cvs checkout -rOPENBSD_3_7 src </pre> <p> Or <tt>OPENBSD_3_6</tt> for 3.6, etc. Index: cvsync.html =================================================================== RCS file: /cvs/www/cvsync.html,v retrieving revision 1.31 diff -u -r1.31 cvsync.html --- cvsync.html 4 Feb 2006 15:09:23 -0000 1.31 +++ cvsync.html 13 Mar 2006 19:08:30 -0000 @@ -142,20 +142,11 @@ </a></h3> <p> -It is now simple to check out any one of the CVSync'ed repositories. -For Korn/Bourne shells: +It is now simple to check out any one of the CVSync'ed repositories: </p> <pre> # cd /usr - # CVSROOT=/cvs cvs checkout src -</pre> -<p> -For csh and its derivatives: -</p> -<pre> - # cd /usr - # setenv CVSROOT /cvs - # cvs checkout src + # cvs -d /cvs checkout src </pre> <p> @@ -166,7 +157,7 @@ </p> <pre> # cd /usr - # cvs checkout -rOPENBSD_3_5 src + # cvs -d /cvs checkout -rOPENBSD_3_5 src </pre> <p> Or <tt>OPENBSD_3_4</tt> for 3.4, etc.