don't remove cgi-bin during installation, to preserve any extra CGIs
authorTony Cook <tony@develop-help.com>
Thu, 24 Apr 2008 10:36:29 +0000 (10:36 +0000)
committertony <tony@45cb6cf1-00bc-42d2-bb5a-07f51df49f94>
Thu, 24 Apr 2008 10:36:29 +0000 (10:36 +0000)
installed.

localinst.perl
site/cgi-bin/admin/menu.pl

index a2e533d..39c0a49 100644 (file)
@@ -17,14 +17,16 @@ my $mysql = BSE::Test::mysql_name;
 #    system "cp $instbase/cgi-bin/modules/Constants.pm $instbase/Constants.pm"
 #  }
 
-system("rm -rf $instbase/cgi-bin")
-  and die "Cannot remove cgi-bin";
-system "rm -rf $instbase/data"
-  and die "Cannot remove data";
+#system("rm -rf $instbase/cgi-bin")
+#  and die "Cannot remove cgi-bin";
+#system "rm -rf $instbase/data"
+#  and die "Cannot remove data";
 #system "rm -f $instbase/htdocs/{*.html,a/*.html,shop/*.html,images/*.jpg}"
 #  and die "Cannot remove htdocs";
 
-system "cp -rf $dist/site/cgi-bin $instbase"
+-d "$instbase/cgi-bin" or mkdir "$instbase/cgi-bin"
+  or die "Cannot create $instbase/cgi-bin: $!";
+system "cp -rf $dist/site/cgi-bin/* $instbase/cgi-bin"
   and die "Cannot copy cgi-bin";
 
 my $perl = BSE::Test::test_perl();
index 7a97f39..b8a1f70 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # -d:ptkdb
-BEGIN { $ENV{DISPLAY} = '192.168.32.50:0.0' }
+BEGIN { $ENV{DISPLAY} = '192.168.32.51:0.0' }
 use strict;
 use FindBin;
 use lib "$FindBin::Bin/../modules";