[Koha-cvs] CVS: koha buildrelease,1.1.2.22,1.1.2.23

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv26901

Modified Files:
      Tag: rel-1-2
	buildrelease 
Log Message:
CVS tagging now defaults to "no" and added koha-tmpl directory


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -C2 -r1.1.2.22 -r1.1.2.23
*** buildrelease	18 Sep 2002 03:56:51 -0000	1.1.2.22
--- buildrelease	21 Oct 2002 18:38:16 -0000	1.1.2.23
***************
*** 142,151 ****
  
  
! print "\nWould you like to tag the CVS repository?\n(answer yes if releasing tarball)  [Y]/N: ";
  chomp ($input=<STDIN>);
! my $cvstag=1;
  # FIXME: This means anything other than n will tag; too dangerous?
! if ($input=~/^n/i) {
!     $cvstag=0;
  }
  
--- 142,151 ----
  
  
! print "\nWould you like to tag the CVS repository?\n(answer yes if releasing tarball)  Y/[N]: ";
  chomp ($input=<STDIN>);
! my $cvstag=0;
  # FIXME: This means anything other than n will tag; too dangerous?
! if ($input=~/^y/i) {
!     $cvstag=1;
  }
  
***************
*** 284,289 ****
  system("rm -f $rootdir/intranet-cgi/installer-lite.pl");
  # FIXME: The following two lines look suspicious
! system("rm -f $rootdir/intranet-cgi/koha-1.2.0.tar.gz");
! system("rm -f $rootdir/intranet-cgi/rel-1-2");
  system("rm -f $rootdir/intranet-cgi/testKoha.pl");
  system("rm -rf $rootdir/intranet-cgi/html-template");
--- 284,289 ----
  system("rm -f $rootdir/intranet-cgi/installer-lite.pl");
  # FIXME: The following two lines look suspicious
! #system("rm -f $rootdir/intranet-cgi/koha-1.2.0.tar.gz");
! #system("rm -f $rootdir/intranet-cgi/rel-1-2");
  system("rm -f $rootdir/intranet-cgi/testKoha.pl");
  system("rm -rf $rootdir/intranet-cgi/html-template");
***************
*** 295,298 ****
--- 295,303 ----
  system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");
  system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
+ 
+ # Move koha-tmpl files
+ system("mv $rootdir/intranet-cgi/koha-tmpl/opac-tmpl/* $rootdir/opac-html");
+ system("mv $rootdir/intranet-cgi/koha-tmpl/intranet-tmpl/* $rootdir/intranet-html");
+ system("rm -rf $rootdir/intranet-cgi/koha-tmpl");
  
  # Remove extraneous files from opac-html