[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/misc Install.pm [rel_2_2]
From: |
MJR |
Subject: |
[Koha-cvs] koha/misc Install.pm [rel_2_2] |
Date: |
Wed, 23 Aug 2006 13:51:51 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: MJR <slef> 06/08/23 13:51:51
Modified files:
misc : Install.pm
Log message:
Fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=1154
Install script doesn't let you skip initial branch and printer
Possibly introduced by auto_install support or avoiding warnings.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/Install.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.88.2.11&r2=1.88.2.12
Patches:
Index: Install.pm
===================================================================
RCS file: /sources/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.11
retrieving revision 1.88.2.12
diff -u -b -r1.88.2.11 -r1.88.2.12
--- Install.pm 23 Aug 2006 13:46:19 -0000 1.88.2.11
+++ Install.pm 23 Aug 2006 13:51:51 -0000 1.88.2.12
@@ -52,19 +52,7 @@
=cut
# set the version for version checking
-<<<<<<< Install.pm
-<<<<<<< Install.pm
-<<<<<<< Install.pm
-$VERSION = 2.3.0;
-=======
$VERSION = 0.01;
->>>>>>> 1.88.2.7
-=======
-$VERSION = 2.2.3;
->>>>>>> 1.94
-=======
-$VERSION = 0.01;
->>>>>>> 1.88.2.10
@ISA = qw(Exporter);
@EXPORT = qw(
@@ -1840,38 +1828,16 @@
setmysqlclipass($mysqlpass);
# Set up permissions
startsysout();
-<<<<<<< Install.pm
- print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user
(Host,User,Password) values ('$hostname','$user',password('$pass'))\"
-h$hostname mysql\;");
- system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db
(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,
index_priv, alter_priv) values
('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" -h$hostname mysql");
- system("$mysqldir/bin/mysqladmin -u$mysqluser -h$hostname reload");
-=======
my $result=system("$mysqldir/bin/mysqladmin", "-u$mysqluser", "create",
"$database");
system("$mysqldir/bin/mysql -u$mysqluser -e \"GRANT ALL PRIVILEGES on
".$database.".* to '$user' IDENTIFIED BY '$pass' \" mysql");
->>>>>>> 1.88.2.10
# Change to admin user login
setmysqlclipass($pass);
-<<<<<<< Install.pm
- my $result=system("$mysqldir/bin/mysqladmin", "-u$user", "-h$hostname",
"create", "$database");
-=======
->>>>>>> 1.88.2.10
if ($result) {
showmessage(getmessage('CreatingDatabaseError'),'PressEnter',
'', 1);
} else {
# Create the database structure
startsysout();
-<<<<<<< Install.pm
-<<<<<<< Install.pm
-<<<<<<< Install.pm
- system("$mysqldir/bin/mysql '-u$user' '-h$hostname' '$database'
< koha.mysql");
-=======
- system("$mysqldir/bin/mysql -u$user $database < koha.mysql");
->>>>>>> 1.88.2.7
-=======
- system("$mysqldir/bin/mysql '-u$user' '$database' <
koha.mysql");
->>>>>>> 1.94
-=======
system("$mysqldir/bin/mysql -u$user $database < koha.mysql");
->>>>>>> 1.88.2.10
}
}
@@ -1979,7 +1945,7 @@
my $input;
my $response;
my $branch='MAIN';
- my $setbranch=0; //MJR: as $branch has a default, need a new test
variable
+ my $setbranch=0; //MJR: need new test flag, because branch is preset
if ($auto_install->{BranchName}) {
$branch=$auto_install->{BranchName};
print ON_YELLOW.BLACK."auto-setting a branch :
$branch".RESET."\n";