[Koha-cvs] CVS: koha/misc Install.pm,1.40,1.41

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv29894

Modified Files:
        Install.pm 
Log Message:
Preserving old template/script dirs if they exist, ready for upgrade to use 
Install.pm

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** Install.pm  18 Jun 2003 23:03:44 -0000      1.40
--- Install.pm  30 Jun 2003 10:06:18 -0000      1.41
***************
*** 1327,1344 ****
  sub installfiles {
  
  
      showmessage(getmessage('InstallFiles'),'none');
!     print getmessage('CopyingFiles', ['intranet-html', "$intranetdir/htdocs" 
]);
!     system("cp -R intranet-html/* $intranetdir/htdocs/");
!     print getmessage('CopyingFiles', ['intranet-cgi', "$intranetdir/cgi-bin" 
]);
!     system("cp -R intranet-cgi/* $intranetdir/cgi-bin/");
!     print getmessage('CopyingFiles', ['stand-alone scripts', 
"$intranetdir/scripts" ]);
!     system("cp -R scripts/* $intranetdir/scripts/");
!     print getmessage('CopyingFiles', ['perl modules', "$intranetdir/modules" 
]);
!     system("cp -R modules/* $intranetdir/modules/");
!     print getmessage('CopyingFiles', ['opac-html', "$opacdir/htdocs" ]);
!     system("cp -R opac-html/* $opacdir/htdocs/");
!     print getmessage('CopyingFiles', ['opac-cgi', "$opacdir/cgi-bin" ]);
!     system("cp -R opac-cgi/* $opacdir/cgi-bin/");
      system("touch $opacdir/cgi-bin/opac");
  
--- 1327,1353 ----
  sub installfiles {
  
+       #MJR: preserve old files, just in case
+       sub neatcopy {
+               my $desc = shift;
+               my $src = shift;
+               my $tgt = shift;
+               
+               if (-d $tgt) {
+               print getmessage('CopyingFiles', ["old ".$desc,$tgt.".old"]);
+                       system("mv ".$tgt." ".$tgt.".old");
+                       }
+ 
+       print getmessage('CopyingFiles', [$desc,$tgt]);
+           system("cp -R ".$src."/* ".$tgt);
+               }
  
      showmessage(getmessage('InstallFiles'),'none');
! 
!     neatcopy("admin templates", 'intranet-html', "$intranetdir/htdocs");
!     neatcopy("admin interface", 'intranet-cgi', "$intranetdir/cgi-bin");
!     neatcopy("main scripts", 'scripts', "$intranetdir/scripts/");
!     neatcopy("perl modules", 'modules', "$intranetdir/modules/");
!     neatcopy("OPAC templates", 'opac-html', "$opacdir/htdocs/");
!     neatcopy("OPAC interface", 'opac-cgi', "$opacdir/cgi-bin/");
      system("touch $opacdir/cgi-bin/opac");