[Sandweb-commit] CVS: sandweb/tools instimages.pl,NONE,1.1 install_script.pl,1.18,1.19

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

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

Modified Files:
	install_script.pl 
Added Files:
	instimages.pl 
Log Message:
working on getting images to install


--- NEW FILE ---
#!/usr/bin/perl -w
# 
# instimages.pl : script for installing sandweb images
#

sub instimages($) {
	return(0) if (!$_[0]);
	my $imgdir = $_[0];

	if (!$imgdir) {
		print("-------------------------------\n");
		print("Installing SandWeb images...\n\n");
		print("Specify the location you wish to install the SandWeb images.\n");
		print("Enter the full path [default: $imgdir] : ");
	
		my $tmp = '';
		chomp($tmp = <STDIN>);
		if ($tmp) {
			$imgdir = $tmp;
		}
	}
	
	if (system('tools/mkdirto.pl', '755', "$imgdir")) {
		return(0);
	}
	
	print("Installing SandWeb images into $imgdir... ");
	
	opendir(DIR, "images/");
	my @files = readdir(DIR);
	closedir(DIR);
	
	foreach my $filename (@files) {
		next if (($filename !~ /\.html$/) && ($filename !~ /\.js$/));
		if (system('cp', "images/$filename", "$imgdir/")) {
			print("working directory: ", `pwd`);
			return(0);
		}
	}
	
	print("done.\n");
	return($imgdir);
}	
1;

Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- install_script.pl	5 Jan 2003 22:18:32 -0000	1.18
+++ install_script.pl	6 Jan 2003 08:15:20 -0000	1.19
@@ -11,4 +11,5 @@
       "cfgdir    = $config::cfgdir\n".
       "cgidir    = $config::cgidir\n".
+      "imgdir    = $config::imgdir\n".
       "tmpldir   = $config::tmpldir\n".
       "cachedir  = $config::cachedir\n".
@@ -22,4 +23,5 @@
 my $cfgdir    = $config::cfgdir    || '/usr/local/etc';
 my $cgidir    = $config::cgidir    || '/var/www/cgi-bin';
+my $imgdir    = $config::cgidir    || '/var/www/images';
 my $tmpldir   = $config::tmpldir   || "$PREFIX/lib/sandweb/templates";
 my $cachedir  = $config::cachedir  || '/var/cache/sandweb';
@@ -33,4 +35,5 @@
 require 'tools/instbin.pl';
 require 'tools/instcgi.pl';
+require 'tools/instimages.pl';
 require 'tools/insttemplates.pl';
 require 'tools/instcachedir.pl';
@@ -85,4 +88,8 @@
 exit(3) if (!$cgidir);
 
+# Images
+$cgidir = instimages($imgdir);
+exit(3) if (!$imgdir);
+
 # Templates
 $tmpldir = insttemplates($tmpldir);
@@ -114,4 +121,6 @@
 
 # updating config file
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'image_dir="/images"', "image_dir=\"$imgdir\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'cgi_path="/cgi-bin"', "cgi_path=\"$cgidir\"");
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'template_dir="../templates"', "template_dir=\"$tmpldir\"");
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'log_dir="../var/log"', "log_dir=\"$logdir\"");