From 9cae0ef4ffd3f2af9cdae990b09c403cf88b1471 Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Tue, 23 Oct 2018 08:49:53 -0500
Subject: [PATCH] MCOL-520

---
 dbcon/mysql/mysql-Columnstore       |  2 +-
 oam/install_scripts/columnstore     |  2 +-
 oam/install_scripts/startupTests.sh |  2 +-
 oam/install_scripts/syslogSetup.sh  | 10 ++++++++++
 oam/post/functions                  |  2 +-
 oam/post/test-001.sh                |  2 +-
 oam/post/test-002.sh                |  2 +-
 oam/post/test-003.sh                |  2 +-
 oam/post/test-004.sh                |  4 ++--
 9 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/dbcon/mysql/mysql-Columnstore b/dbcon/mysql/mysql-Columnstore
index 596cdb025..370b277d0 100755
--- a/dbcon/mysql/mysql-Columnstore
+++ b/dbcon/mysql/mysql-Columnstore
@@ -60,7 +60,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore
index 409497e32..130511a1c 100644
--- a/oam/install_scripts/columnstore
+++ b/oam/install_scripts/columnstore
@@ -34,7 +34,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
diff --git a/oam/install_scripts/startupTests.sh b/oam/install_scripts/startupTests.sh
index ac290df43..2c0decc4d 100755
--- a/oam/install_scripts/startupTests.sh
+++ b/oam/install_scripts/startupTests.sh
@@ -20,7 +20,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
diff --git a/oam/install_scripts/syslogSetup.sh b/oam/install_scripts/syslogSetup.sh
index 0fd9f5998..e2d690fb4 100755
--- a/oam/install_scripts/syslogSetup.sh
+++ b/oam/install_scripts/syslogSetup.sh
@@ -156,7 +156,17 @@ fi
 
 }
 
+makeDir() {
+	test -d /var/log/mariadb/columnstore || mkdir -p /var/log/mariadb/columnstore >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnstore/archive >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1
+	chmod 777 -R /var/log/mariadb/columnstore
+	chown $user:$user -R /var/log/mariadb
+}
+
 install() {
+makeDir
 checkSyslog
 if [ ! -z "$syslog_conf" ] ; then
 	$installdir/bin/setConfig -d Installation SystemLogConfigFile ${syslog_conf} >/dev/null 2>&1
diff --git a/oam/post/functions b/oam/post/functions
index e5cb8c3a4..4e9975eb4 100755
--- a/oam/post/functions
+++ b/oam/post/functions
@@ -19,7 +19,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
diff --git a/oam/post/test-001.sh b/oam/post/test-001.sh
index 47e18487f..2f0d0fcfb 100755
--- a/oam/post/test-001.sh
+++ b/oam/post/test-001.sh
@@ -19,7 +19,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
diff --git a/oam/post/test-002.sh b/oam/post/test-002.sh
index 42f52d3a8..7e4665672 100755
--- a/oam/post/test-002.sh
+++ b/oam/post/test-002.sh
@@ -19,7 +19,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
diff --git a/oam/post/test-003.sh b/oam/post/test-003.sh
index c3dc2467c..7d733ef78 100755
--- a/oam/post/test-003.sh
+++ b/oam/post/test-003.sh
@@ -19,7 +19,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
diff --git a/oam/post/test-004.sh b/oam/post/test-004.sh
index 6f6e009cb..3da9255ac 100644
--- a/oam/post/test-004.sh
+++ b/oam/post/test-004.sh
@@ -23,7 +23,7 @@ if [ $USER != "root" ]; then
 		profileFile=$prefix/.bashrc
 	fi
 		
-	. .$profileFile
+	. $profileFile
 fi
 
 # Source function library.
@@ -35,7 +35,7 @@ if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
 	COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
 fi
 
-export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DI
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 
 test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions