From owner-freebsd-cvsweb@FreeBSD.ORG Mon Dec 27 20:50:15 2004 Return-Path: Delivered-To: freebsd-cvsweb@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 212FA16A4CE for ; Mon, 27 Dec 2004 20:50:15 +0000 (GMT) Received: from smtp1.pp.htv.fi (smtp1.pp.htv.fi [213.243.153.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF1C143D39 for ; Mon, 27 Dec 2004 20:50:14 +0000 (GMT) (envelope-from scop@FreeBSD.org) Received: from cs78128192.pp.htv.fi (cs78128192.pp.htv.fi [62.78.128.192]) by smtp1.pp.htv.fi (Postfix) with ESMTP id 804B17FC65 for ; Mon, 27 Dec 2004 22:50:13 +0200 (EET) From: Ville =?ISO-8859-1?Q?Skytt=E4?= To: freebsd-cvsweb@freebsd.org In-Reply-To: <712ba87c04122712117c91d6cd@mail.gmail.com> References: <712ba87c04122712117c91d6cd@mail.gmail.com> Content-Type: text/plain Organization: FreeBSD Date: Mon, 27 Dec 2004 22:50:13 +0200 Message-Id: <1104180613.1059.7.camel@bobcat.mine.nu> Mime-Version: 1.0 X-Mailer: Evolution 2.0.2 (2.0.2-3) Content-Transfer-Encoding: 7bit Subject: Re: @command_path not used? X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Dec 2004 20:50:15 -0000 On Mon, 2004-12-27 at 15:11 -0500, Richard Hurt wrote: > I am having difficulty using the diff functionality of CVSWeb. My > system (HP-UX 11) has older, HP versions of the various external tools > used by CVSWeb (rlog, rcsdiff, diff, etc.) located at /usr/bin. I > have loaded the newer, GNU versions in my own directory > /home/www/apps/bin and set the @command_path list to only my > directory. Most things are working fine including the graph > functionality, however whenever I try to diff two versions it always > uses the wrong diff (/usr/bin/diff) which doesnt recognize the -u > option. :( > > I have tried a couple of different things but nothing seems to work. > When I created a blank @command_path listing I couldn't even see the > home page (complained about rlog missing), so it seems to work (at > least for some commands). Any thoughts on why this is happening? @command_path affects only executables directly invoked by cvsweb. And cvsweb doesn't invoke diff directly [0], it invokes rcsdiff which then again uses internally whatever diff it considers appropriate. One thing to try: add this somewhere in your cvsweb.conf: $ENV{PATH} = '/home/www/apps/bin'; If rcsdiff uses $PATH, that could help. If not, it might have a compiled in path to the diff tool it's using. HTH... [0] By default, that is. One can configure different diff tools for different MIME types with %DIFF_COMMANDS in cvsweb.conf.