Redo directory structure.

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

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

 #
 # install.pl
 #
 #
 # install.pl
 #


@@ -6,7 +6,7 @@
 # 
 # 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 
 # which Perl itself is published.
 #
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.


@@ -14,10 +14,11 @@
 BEGIN {
   our $VERSION = "0.01";
   use File::Basename;
 BEGIN {
   our $VERSION = "0.01";
   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);
 


@@ -36,17 +37,21 @@ GetOptions ('u|update=s' => \$OptUpdate,
             'V|version'  => \&ShowVersion) or exit 1;
 
 ### change working directory to .. (as we're in .../install)
             '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('')};

 
 ##### --------------------------------------------------------------------------
 ##### 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);
 -- 
 -- Table structure for table DBTableRaw
 my %DBCreate = ('DBTableRaw'  => <<RAW, 'DBTableGrps' => <<GRPS);
 -- 
 -- Table structure for table DBTableRaw


@@ -134,7 +139,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 +151,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,7 +180,6 @@ 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);
   # check for tables and create them, if they don't exist yet
   foreach my $Table (keys %DBCreate) {
     &CreateTable($Table);


@@ -270,15 +294,15 @@ Don't do a fresh install, but update from I<version>.
 
 =over 4
 
 
 =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.