database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-10 01:22:48 +03:00
Code Activity

fix package install names

Browse Source
This commit is contained in:
david hill
2016-02-23 16:47:19 -06:00
parent 7dd06e6a4d
commit a6854cb1ca
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oam/install_scripts/performance_installer.sh
View File

@@ -35,18 +35,20 @@ if { $DEBUG == "1" } {
set BASH "/bin/bash -x " set BASH "/bin/bash -x "
} }
set HOME "$env(HOME)"
log_user $DEBUG log_user $DEBUG
spawn -noecho /bin/bash spawn -noecho /bin/bash
# #
if { $PKGTYPE == "rpm" } { if { $PKGTYPE == "rpm" } {
set PKGERASE "rpm -e --nodeps '$'(rpm -qa | grep '^infinidb')" set PKGERASE "rpm -e --nodeps \$(rpm -qa | grep '^infinidb')"
set PKGERASE1 "rpm -e --nodeps " set PKGERASE1 "rpm -e --nodeps "
set PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*" set PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*"
set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*" set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*"
} else { } else {
if { $PKGTYPE == "deb" } { if { $PKGTYPE == "deb" } {
set PKGERASE "dpkg -P '$'(dpkg --get-selections | grep '^infinidb')" set PKGERASE "dpkg -P \$(dpkg --get-selections | grep '^infinidb')"
set PKGERASE1 "dpkg -P " set PKGERASE1 "dpkg -P "
set PKGINSTALL "dpkg -i --force-confnew infinidb*$VERSION*" set PKGINSTALL "dpkg -i --force-confnew infinidb*$VERSION*"
set PKGUPGRADE "dpkg -i --force-confnew infinidb*$VERSION*" set PKGUPGRADE "dpkg -i --force-confnew infinidb*$VERSION*"
@@ -170,7 +172,7 @@ if { $INSTALLTYPE == "initial"} {
# #
send_user "Install InfiniDB Packages on Module " send_user "Install InfiniDB Packages on Module "
send "ssh $USERNAME@$SERVER '$PKGINSTALL $CALPONTRPM1 ;$PKGERASE dummy'\n" send "ssh $USERNAME@$SERVER '$PKGINSTALL infinidb*$VERSION* ;$PKGERASE dummy'\n"
if { $PASSWORD != "ssh" } { if { $PASSWORD != "ssh" } {
set timeout 30 set timeout 30
expect { expect {

6
oam/install_scripts/user_installer.sh
View File

@@ -41,18 +41,20 @@ set BASH "/bin/bash "
# set BASH "/bin/bash -x " # set BASH "/bin/bash -x "
#} #}
set HOME "$env(HOME)"
log_user $DEBUG log_user $DEBUG
spawn -noecho /bin/bash spawn -noecho /bin/bash
# #
if { $PKGTYPE == "rpm" } { if { $PKGTYPE == "rpm" } {
set PKGERASE "rpm -e --nodeps '$'(rpm -qa | grep '^infinidb')" set PKGERASE "rpm -e --nodeps \$(rpm -qa | grep '^infinidb')"
set PKGERASE1 "rpm -e --nodeps " set PKGERASE1 "rpm -e --nodeps "
set PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*" set PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*"
set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*" set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*"
} else { } else {
if { $PKGTYPE == "deb" } { if { $PKGTYPE == "deb" } {
set PKGERASE "dpkg -P '$'(dpkg --get-selections | grep '^infinidb')" set PKGERASE "dpkg -P \$(dpkg --get-selections | grep '^infinidb')"
set PKGERASE1 "dpkg -P " set PKGERASE1 "dpkg -P "
set PKGINSTALL "dpkg -i --force-confnew infinidb*$VERSION*" set PKGINSTALL "dpkg -i --force-confnew infinidb*$VERSION*"
set PKGUPGRADE "dpkg -i --force-confnew infinidb*$VERSION*" set PKGUPGRADE "dpkg -i --force-confnew infinidb*$VERSION*"

4
oamapps/postConfigure/postConfigure.cpp
View File

@@ -3088,7 +3088,7 @@ int main(int argc, char *argv[])
//run remote installer script //run remote installer script
cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + EEPackageType + " " + nodeps + " " + temppwprompt + " " + mysqlPort + " " + remote_installer_debug + " " + debug_logfile; cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + EEPackageType + " " + nodeps + " " + temppwprompt + " " + mysqlPort + " " + remote_installer_debug + " " + debug_logfile;
cout << cmd << endl; //cout << cmd << endl;
if ( thread_remote_installer ) { if ( thread_remote_installer ) {
thr_data[thread_id].command = cmd; thr_data[thread_id].command = cmd;
@@ -3237,7 +3237,7 @@ cout << cmd << endl;
//run remote installer script //run remote installer script
cmd = installDir + "/bin/performance_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + EEPackageType + " " + nodeps + " " + remote_installer_debug + " " + debug_logfile; cmd = installDir + "/bin/performance_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + EEPackageType + " " + nodeps + " " + remote_installer_debug + " " + debug_logfile;
cout << cmd << endl; //cout << cmd << endl;
if ( thread_remote_installer ) { if ( thread_remote_installer ) {
thr_data[thread_id].command = cmd; thr_data[thread_id].command = cmd;