diff --git a/oam/install_scripts/performance_installer.sh b/oam/install_scripts/performance_installer.sh index 59513df30..ae47890be 100644 --- a/oam/install_scripts/performance_installer.sh +++ b/oam/install_scripts/performance_installer.sh @@ -35,18 +35,20 @@ if { $DEBUG == "1" } { set BASH "/bin/bash -x " } +set HOME "$env(HOME)" + log_user $DEBUG spawn -noecho /bin/bash # 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 PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*" set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*" } else { 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 PKGINSTALL "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 "ssh $USERNAME@$SERVER '$PKGINSTALL $CALPONTRPM1 ;$PKGERASE dummy'\n" + send "ssh $USERNAME@$SERVER '$PKGINSTALL infinidb*$VERSION* ;$PKGERASE dummy'\n" if { $PASSWORD != "ssh" } { set timeout 30 expect { diff --git a/oam/install_scripts/user_installer.sh b/oam/install_scripts/user_installer.sh index a93f396ef..54aa7ca27 100644 --- a/oam/install_scripts/user_installer.sh +++ b/oam/install_scripts/user_installer.sh @@ -41,18 +41,20 @@ set BASH "/bin/bash " # set BASH "/bin/bash -x " #} +set HOME "$env(HOME)" + log_user $DEBUG spawn -noecho /bin/bash # 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 PKGINSTALL "rpm -ivh $NODEPS --force infinidb*$VERSION*" set PKGUPGRADE "rpm -Uvh --noscripts infinidb*$VERSION*" } else { 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 PKGINSTALL "dpkg -i --force-confnew infinidb*$VERSION*" set PKGUPGRADE "dpkg -i --force-confnew infinidb*$VERSION*" diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index 269e6a257..cbc0de246 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -3088,7 +3088,7 @@ int main(int argc, char *argv[]) //run remote installer script 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 ) { thr_data[thread_id].command = cmd; @@ -3237,7 +3237,7 @@ cout << cmd << endl; //run remote installer script 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 ) { thr_data[thread_id].command = cmd;