From 9b99660f8480f7f2054dba5d4f8b6c73ed491a87 Mon Sep 17 00:00:00 2001
From: Jose Rojas <jose.rojas@mariadb.com>
Date: Thu, 3 Oct 2019 17:58:49 +0000
Subject: [PATCH] MCOL-3537 Reworded Post Installation Instruction in
 post-install script

---
 oam/install_scripts/post-install.in | 30 ++++++++++-------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/oam/install_scripts/post-install.in b/oam/install_scripts/post-install.in
index 993d8598a..cee979792 100755
--- a/oam/install_scripts/post-install.in
+++ b/oam/install_scripts/post-install.in
@@ -323,19 +323,13 @@ if [ -z "$hadoop" ]; then
 cat <<EOD
 The next steps are:
 
-If installing on a pm1 node using non-distributed install
+If installation on pm1:
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 $installdir/bin/postConfigure -i $installdir
 
-If installing on a pm1 node using distributed install
-
-export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-$installdir/bin/postConfigure -i $installdir -d
-
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
@@ -346,15 +340,11 @@ EOD
 cat <<EOD
 The next step is:
 
-If installing on a pm1 node using non-distributed install
+If installation on pm1:
 
 $installdir/bin/postConfigure
 
-If installing on a pm1 node using distributed install
-
-$installdir/bin/postConfigure -d
-
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 $installdir/bin/columnstore start
 
@@ -386,7 +376,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 . $installdir/bin/setenv-hdfs-20
 $installdir/bin/postConfigure -i $installdir
 
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
@@ -400,7 +390,7 @@ export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 $installdir/bin/postConfigure -i $installdir
 
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
@@ -415,7 +405,7 @@ If you are intending to install MariaDB Columnstore over Hadoop, the next steps
 . $installdir/bin/setenv-hdfs-20
 $installdir/bin/postConfigure
 
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 . $installdir/bin/setenv-hdfs-20
 $installdir/bin/columnstore start
@@ -426,7 +416,7 @@ If installing on a pm1 node:
 
 $installdir/bin/postConfigure
 
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 $installdir/bin/columnstore start
 
@@ -472,7 +462,7 @@ If installing on a pm1 node:
 . $installdir/bin/setenv-hdfs-12
 $installdir/bin/postConfigure
 
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 . $installdir/bin/setenv-hdfs-12
 $installdir/bin/columnstore start
@@ -483,7 +473,7 @@ If installing on a pm1 node:
 
 $installdir/bin/postConfigure
 
-If installing on a non-pm1 using the non-distributed option:
+If installing on a node other than pm1:
 
 $installdir/bin/columnstore start