Bump version numbers.

[usenet/newsstats.git] / install / install.pl

diff --git a/install/install.pl b/install/install.pl
index 61e8ef1..fabdaa1 100755 (executable)
--- a/install/install.pl
+++ b/install/install.pl
@@ -1,23 +1,24 @@
-#! /usr/bin/perl -W
+#! /usr/bin/perl

 #
 # install.pl
 #
 # This script will create database tables as necessary.
 #
 # install.pl
 #
 # This script will create database tables as necessary.

-# 
+#

 # It is part of the NewsStats package.
 #
 # It is part of the NewsStats package.
 #

-# Copyright (c) 2010-2012 Thomas Hochstein <thh@inter.net>
+# Copyright (c) 2010-2013 Thomas Hochstein <thh@inter.net>

 #
 #

-# It can be redistributed and/or modified under the same terms under 
+# It can be redistributed and/or modified under the same terms under

 # which Perl itself is published.
 
 BEGIN {
 # which Perl itself is published.
 
 BEGIN {

-  our $VERSION = "0.01";
+  our $VERSION = "0.02";

   use File::Basename;
   use File::Basename;

-  # we're in .../install, so our module is in ..
-  push(@INC, dirname($0).'/..');
+  # we're in .../install, so our module is in ../lib
+  push(@INC, dirname($0).'/../lib');

 }
 use strict;
 }
 use strict;

+use warnings;

 
 use NewsStats qw(:DEFAULT);
 
 
 use NewsStats qw(:DEFAULT);
 


@@ -30,27 +31,32 @@ Getopt::Long::config ('bundling');
 ################################# Main program #################################
 
 ### read commandline options
 ################################# Main program #################################
 
 ### read commandline options

-my ($OptUpdate);
+my ($OptUpdate,$OptConfFile);

 GetOptions ('u|update=s' => \$OptUpdate,
 GetOptions ('u|update=s' => \$OptUpdate,

+            'conffile=s' => \$OptConfFile,

             'h|help'     => \&ShowPOD,
             'V|version'  => \&ShowVersion) or exit 1;
 
 ### change working directory to .. (as we're in .../install)
             'h|help'     => \&ShowPOD,
             'V|version'  => \&ShowVersion) or exit 1;
 
 ### change working directory to .. (as we're in .../install)

-chdir dirname($0).'/..';
+chdir dirname($FullPath).'/..';

 my $Path = cwd();
 
 ### read configuration
 print("Reading configuration.\n");
 my $Path = cwd();
 
 ### read configuration
 print("Reading configuration.\n");

-my %Conf = %{ReadConfig($HomePath.'/newsstats.conf')};
+my %Conf = %{ReadConfig($OptConfFile)};

 
 ##### --------------------------------------------------------------------------
 ##### Database table definitions
 ##### --------------------------------------------------------------------------
 
 
 ##### --------------------------------------------------------------------------
 ##### Database table definitions
 ##### --------------------------------------------------------------------------
 

+my $DBCreate = <<SQLDB;
+CREATE DATABASE IF NOT EXISTS `$Conf{'DBDatabase'}` DEFAULT CHARSET=utf8;
+SQLDB
+

 my %DBCreate = ('DBTableRaw'  => <<RAW, 'DBTableGrps' => <<GRPS);
 my %DBCreate = ('DBTableRaw'  => <<RAW, 'DBTableGrps' => <<GRPS);

--- 
+--

 -- Table structure for table DBTableRaw
 -- Table structure for table DBTableRaw

--- 
+--

 
 CREATE TABLE IF NOT EXISTS `$Conf{'DBTableRaw'}` (
   `id` bigint(20) unsigned NOT NULL auto_increment,
 
 CREATE TABLE IF NOT EXISTS `$Conf{'DBTableRaw'}` (
   `id` bigint(20) unsigned NOT NULL auto_increment,


@@ -71,9 +77,9 @@ CREATE TABLE IF NOT EXISTS `$Conf{'DBTableRaw'}` (
   KEY `peer` (`peer`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='Raw data';
 RAW
   KEY `peer` (`peer`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='Raw data';
 RAW

--- 
+--

 -- Table structure for table DBTableGrps
 -- Table structure for table DBTableGrps

--- 
+--

 
 CREATE TABLE IF NOT EXISTS `$Conf{'DBTableGrps'}` (
   `id` bigint(20) unsigned NOT NULL auto_increment,
 
 CREATE TABLE IF NOT EXISTS `$Conf{'DBTableGrps'}` (
   `id` bigint(20) unsigned NOT NULL auto_increment,


@@ -134,7 +140,9 @@ Enjoy!
 -thh <thh\@inter.net>
 INSTALL
 
 -thh <thh\@inter.net>
 INSTALL
 

-my $Upgrade = <<UPGRADE;
+my $Upgrade ='';
+if ($OptUpdate) {
+ $Upgrade = <<UPGRADE;

 ----------
 Your installation was upgraded from $OptUpdate to $PackageVersion.
 
 ----------
 Your installation was upgraded from $OptUpdate to $PackageVersion.
 


@@ -144,9 +152,27 @@ Don't forget to restart your INN feed so that it can pick up the new version:
 
 (or whatever you called your feed).
 UPGRADE
 
 (or whatever you called your feed).
 UPGRADE

+}

 
 ##### --------------------------- End of definitions ---------------------------
 
 
 ##### --------------------------- End of definitions ---------------------------
 

+### create DB, if necessary
+if (!$OptUpdate) {
+  print "----------\nStarting database creation.\n";
+  # create database
+  # we can't use InitDB() as that will use a table name of
+  # the table that doesn't exist yet ...
+  my $DBHandle = DBI->connect(sprintf('DBI:%s:host=%s',$Conf{'DBDriver'},
+                                      $Conf{'DBHost'}), $Conf{'DBUser'},
+                                      $Conf{'DBPw'}, { PrintError => 0 });
+  my $DBQuery = $DBHandle->prepare($DBCreate);
+  $DBQuery->execute() or &Bleat(2, sprintf("Can't create database %s: %s%\n",
+                                           $Conf{'DBDatabase'}, $DBI::errstr));
+
+  printf("Database table %s created succesfully.\n",$Conf{'DBDatabase'});
+  $DBHandle->disconnect;
+};
+

 ### DB init, read list of tables
 print "Reading database information.\n";
 my $DBHandle = InitDB(\%Conf,1);
 ### DB init, read list of tables
 print "Reading database information.\n";
 my $DBHandle = InitDB(\%Conf,1);


@@ -155,13 +181,12 @@ my %TablesInDB =
 
 if (!$OptUpdate) {
   ##### installation mode
 
 if (!$OptUpdate) {
   ##### installation mode

-  print "----------\nStarting database table generation.\n";

   # check for tables and create them, if they don't exist yet
   foreach my $Table (keys %DBCreate) {
     &CreateTable($Table);
   };
   print "Database table generation done.\n";
   # check for tables and create them, if they don't exist yet
   foreach my $Table (keys %DBCreate) {
     &CreateTable($Table);
   };
   print "Database table generation done.\n";

- 
+

   # Display install instructions
   print $Install;
 } else {
   # Display install instructions
   print $Install;
 } else {


@@ -231,7 +256,7 @@ install - installation script
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-B<install> [B<-Vh> [--update I<version>]
+B<install> [B<-Vh> [--update I<version>] [--conffile I<filename>]

 
 =head1 REQUIREMENTS
 
 
 =head1 REQUIREMENTS
 


@@ -264,21 +289,25 @@ Print this man page and exit.
 
 Don't do a fresh install, but update from I<version>.
 
 
 Don't do a fresh install, but update from I<version>.
 

+=item B<--conffile> I<filename>
+
+Load configuration from I<filename> instead of F<newsstats.conf>.
+

 =back
 
 =head1 FILES
 
 =over 4
 
 =back
 
 =head1 FILES
 
 =over 4
 

-=item F<install.pl>
+=item F<install/install.pl>

 
 The script itself.
 
 
 The script itself.
 

-=item F<NewsStats.pm>
+=item F<lib/NewsStats.pm>

 
 Library functions for the NewsStats package.
 
 
 Library functions for the NewsStats package.
 

-=item F<newsstats.conf>
+=item F<etc/newsstats.conf>

 
 Runtime configuration file.
 
 
 Runtime configuration file.
 


@@ -311,7 +340,7 @@ Thomas Hochstein <thh@inter.net>
 
 =head1 COPYRIGHT AND LICENSE
 
 
 =head1 COPYRIGHT AND LICENSE
 

-Copyright (c) 2010-2012 Thomas Hochstein <thh@inter.net>
+Copyright (c) 2010-2013 Thomas Hochstein <thh@inter.net>

 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.