[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.23,1.24

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv16064

Modified Files:
	install_script.pl 
Log Message:
merging "faulty images dir" fix from branch


Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- install_script.pl	23 Apr 2003 22:46:17 -0000	1.23
+++ install_script.pl	1 Jun 2003 20:42:26 -0000	1.24
@@ -24,4 +24,5 @@
 my $cgidir    = $config::cgidir    || '/var/www/cgi-bin';
 my $imgdir    = $config::imgdir    || '/var/www/images';
+my $imgpath   = $config::imgpath   || '/images';
 my $tmpldir   = $config::tmpldir   || "$PREFIX/lib/sandweb/templates";
 my $cachedir  = $config::cachedir  || '/var/cache/sandweb';
@@ -94,4 +95,14 @@
 exit(3) if (!$imgdir);
 
+print("-------------------------\n");
+print("Specify the location of the images relative to your web server's document root.\n");
+print("[default: $imgpath] : ");
+my $tmp = '';
+chomp($tmp = <STDIN>);
+if ($tmp) {
+	$imgpath = $tmp;
+}
+
+
 # Templates
 $tmpldir = insttemplates($tmpldir);
@@ -129,4 +140,5 @@
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'ssh_bin="/usr/bin/ssh"', "ssh_bin=\"$ssh_bin\"");
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'cvs_bin="/usr/bin/cvs"', "cvs_bin=\"$cvs_bin\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'image_dir="/images"', "image_dir=\"$imgpath\"");
 
 # updating config path in executables