This commit was manufactured by cvs2svn to create branch

'STABLE_4_6-branch'.
interchange · Jul 2, 2001 · a1cff99 · a1cff99
4 parents 098d0e0 + 59aabc1 + f0cc7f7 + 31b6b82
commit a1cff99
Show file tree

Hide file tree

Showing 114 changed files with 9,712 additions and 1,354 deletions.
diff --git a/MANIFEST b/MANIFEST
diff --git a/Makefile.PL b/Makefile.PL
@@ -1,10 +1,13 @@
 use ExtUtils::MakeMaker;
 require ExtUtils::Install;
 
+my $changed_dir_initially;
+
 BEGIN {
 	eval {
 		require FindBin;
-		chdir $FindBin::RealBin;
+		chdir $FindBin::RealBin
+			and $changed_dir_initially = 1;
 	};
 }
 
@@ -28,7 +31,7 @@ my @mods_to_get;
 my @remove_old;
 my $Lock_troubles;
 
-$VERSION = '4.6.1';
+$VERSION = '4.6.5';
 
 # See if we have the CPAN module
 
@@ -48,7 +51,27 @@ my @chown_files = qw/
 use lib './lib';
 
 
-my $origdir = cwd();
+my $origdir;
+if ($changed_dir_initially) {
+	$origdir = cwd();
+}
+elsif($ENV{PWD}) {
+	## We will try
+	$origdir = $ENV{PWD};
+}
+else {
+	print <<EOF;
+We know this sounds dumb, but we need to know the current directory. Your
+system administratory appears to have set up your system so that you cannot
+search the directory path above you. Were you to ever change directory
+to /tmp or something, you couldn't even walk the tree back to your own
+directory.
+
+EOF
+
+	$origdir = my_prompt(qq{What is the directory you are in currently? });
+
+}
 
 # See if we have Term::ReadLine::Perl
 eval {
@@ -57,6 +80,7 @@ eval {
 		require Term::ReadKey;
 		$TermRead = 1;
 };
+
 unless($@) {
 	$ENV{PERL_RL} = 'Perl';
 }
@@ -155,7 +179,7 @@ sub copyright_prompt {
 
  Interchange V$VERSION
  
-  Copyright (C) 1996-2000 Akopia, Inc. <info\@akopia.com>
+  Copyright (C) 1996-2001 Akopia, Inc. <info\@akopia.com>
 
  Interchange is free under the terms of the GNU General Public License.
 
@@ -713,11 +737,21 @@ sub MY::install {
 		\*install;
 	}
 
-	my $new = <<'EOF';
+	my $uidparm;
+
+	if (-f "_uid") {
+		if (open UID, '_uid') {
+			chomp (my $uid = <UID>);
+			close UID;
+			$uidparm = "INTERCHANGE_USER=$uid";
+		}
+	}
+
+	my $new = <<EOF;
 VERBINST=0
 
 mv_install ::
-			$(PERL) Makefile.PL force final=$(INSTALLARCHLIB)
+			\$(PERL) Makefile.PL force $uidparm final=\$(INSTALLARCHLIB)
 
 install :: all pure_install doc_install mv_install
 
@@ -770,6 +804,10 @@ EOF
 	GetOptions(\%optctl, @options)
 		or die "Bad option get\n";
 
+	if($MV::Default{PREFIX} and ! $changed_dir_initially) {
+		$origdir = cwd();
+	}
+
 #	use Data::Dumper;
 #	$Data::Dumper::Terse = $Data::Dumper::Indent = 2;
 #	print "ARGV: " . Dumper(\@ARGV);
@@ -784,14 +822,15 @@ else {
 	WriteMakefile(
 		NAME       => "Interchange",
 		MAN3PODS => {
-						'pod/icbackoffice.pod' => 'blib/man3/icbackoffice.8',
+						'pod/icbackoffice.pod'	=> 'blib/man3/icbackoffice.8',
+						'pod/iccattut.pod'		=> 'blib/man3/iccattut.8',
 						'pod/icconfig.pod'		=> 'blib/man3/icconfig.8',
 						'pod/icdatabase.pod'	=> 'blib/man3/icdatabase.8',
 						'pod/icinstall.pod'		=> 'blib/man3/icinstall.8',
 						'pod/icintro.pod'		=> 'blib/man3/icintro.8',
 						'pod/ictemplates.pod'	=> 'blib/man3/ictemplates.8',
 						'pod/mv_metadata.pod'	=> 'blib/man3/mv_metadata.8',
-						'pod/mvtags.pod'       => 'blib/man3/mvtags.8',
+						'pod/mvtags.pod'		=> 'blib/man3/mvtags.8',
 						},
 		DISTNAME => "interchange",
 		clean    => {

diff --git a/QuickStart b/QuickStart
@@ -1,6 +1,6 @@
-Interchange V4.6.1
+Interchange V4.6.5
 
-Copyright (C) 1996-2000 Akopia, Inc. <info@akopia.com>
+Copyright (C) 1996-2001 Akopia, Inc. <info@akopia.com>
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
@@ -61,7 +61,7 @@ Install Walkthrough
              Write on the cgi-bin for the web server
 
         Unpack the distribution:
-            gzip -dc interchange-4.6.1.tar.gz | tar xvf -
+            gzip -dc interchange-4.6.*.tar.gz | tar xvf -
 
         Run the configuration script:
             ./configure
@@ -532,7 +532,7 @@ Demo Store Install Walkthrough
 Low traffic settings.
 Calling UI....
 ....UI is loaded....
-Interchange V4.6.1
+Interchange V4.6.x
 Configuring catalog example...done.
 Interchange server started in INET and UNIX mode(s) (process id 22200)
 

diff --git a/README b/README
@@ -1,6 +1,6 @@
-Interchange V4.6.1
+Interchange V4.6.5
 
-Copyright (C) 1996-2000 Akopia, Inc. <info@akopia.com>
+Copyright (C) 1996-2001 Akopia, Inc. <info@akopia.com>
 
 Originally based on Vend 0.2
 Copyright 1995 by Andrew M. Wilcox
@@ -87,8 +87,8 @@ UNIX INSTALLATION
 ------------------
 Here is the short version:
 
-    gzip -dc interchange-4.6.1.tar.gz | tar xvf -
+    gzip -dc interchange-4.6.*.tar.gz | tar xvf -
-    cd interchange-4.6.1
+    cd interchange-4.6.*
     ./configure
 
 The 'configure' script is basically a shortcut for:

diff --git a/README.cvs b/README.cvs
@@ -74,12 +74,12 @@ to make a distribution tar file:
 	Writing Makefile for Interchange
 	$ make tardist
 	/usr/local/bin/perl -I/YOUR/PERL/LIB -MExtUtils::Manifest=manicopy,maniread \
-	-e "manicopy(maniread(),'interchange-4.6.1', 'best');"
+	-e "manicopy(maniread(),'interchange-4.6.x', 'best');"
-	mkdir interchange-4.6.1
+	mkdir interchange-4.6.x
-	mkdir interchange-4.6.1/dist
+	mkdir interchange-4.6.x/dist
 	....
 	$ ls interch*
-	interchange-4.6.1.tar.gz
+	interchange-4.6.x.tar.gz
 
 =head2 Unpack and install
 

diff --git a/README.debian b/README.debian
@@ -14,5 +14,16 @@ not (yet) approved by Akopia.
 Feedback
 --------
 
-Please send your comments and bug reports to Stefan Hornburg 
+Please send your comments and bug reports to Stefan Hornburg (Racke)
 <racke@linuxia.de>.
+
+APT Sources
+===========
+
+Interchange Debian packages for unstable (sid) are part of the Debian
+distribution.
+
+Interchange Debian packages for stable (potato) are available from:
+
+deb http://ftp.minivend.com/interchange/debian interchange main
+deb-src http://ftp.minivend.com/interchange/debian interchange main
diff --git a/README.rpm b/README.rpm
@@ -1,12 +1,12 @@
 NAME
-    README.rpm - Interchange RPM for Redhat Systems
+    README.rpm - Interchange RPM for Red Hat Linux systems
 
 VERSION
-    4.6.1
+    4.6.5
 
 SYNOPSIS
-    rpm -Uvh interchange-4.6.1-1.rh6.i386.rpm
+    rpm -Uvh interchange-4.6.*.rh6.i386.rpm
-    rpm -Uvh interchange-4.6.1-1.rh7.i386.rpm
+    rpm -Uvh interchange-4.6.*.rh7.i386.rpm
 
 DESCRIPTION
     The Interchange 4 RPM is designed to integrate Interchange with a stock