database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-12 23:42:47 +03:00
Code Activity

fix non-root install issues after the latest merge

Browse Source
This commit is contained in:
David Hill
2017-05-18 09:28:03 -05:00
parent 76d07d84f3
commit d3d2caaa7f
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oam/install_scripts/columnstore.def
View File

@@ -4,6 +4,6 @@
# Change this line to your MariaDB Columnstore installation directory # Change this line to your MariaDB Columnstore installation directory
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$LD_LIBRARY_PATH

12
oam/install_scripts/post-install
View File

@@ -39,7 +39,7 @@ done
if [ $user != "root" ]; then if [ $user != "root" ]; then
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
else else
# add library config file # add library config file
/bin/cp -f $installdir/bin/columnstore.conf /etc/ld.so.conf.d/. >/dev/null 2>&1 /bin/cp -f $installdir/bin/columnstore.conf /etc/ld.so.conf.d/. >/dev/null 2>&1
@@ -274,7 +274,7 @@ cat <<EOD
The next steps are: The next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure -i $installdir
EOD EOD
@@ -305,14 +305,14 @@ cat <<EOD
If you are intending to install MariaDB Columnstore over Hadoop, the next steps are: If you are intending to install MariaDB Columnstore over Hadoop, the next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
. $installdir/bin/setenv-hdfs-20 . $installdir/bin/setenv-hdfs-20
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure -i $installdir
If you are intending to install MariaDB Columnstore without Hadoop, the next steps are: If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure -i $installdir
EOD EOD
@@ -344,14 +344,14 @@ cat <<EOD
If you are intending to install MariaDB Columnstore over Hadoop, the next steps are: If you are intending to install MariaDB Columnstore over Hadoop, the next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql:$libpath export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib:$libpath
. $installdir/bin/setenv-hdfs-12 . $installdir/bin/setenv-hdfs-12
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure -i $installdir
If you are intending to install MariaDB Columnstore without Hadoop, the next steps are: If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
export COLUMNSTORE_INSTALL_DIR=$installdir export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
$installdir/bin/postConfigure -i $installdir $installdir/bin/postConfigure -i $installdir
EOD EOD

9
oam/install_scripts/pre-uninstall
View File

@@ -164,10 +164,11 @@ else
fi fi
#remove library paths #remove library paths
if [ $installdir == "/usr/local/mariadb/columnstore" ]; then if [ $user = "root" ]; then
# remove library config file rm -f /etc/ld.so.conf.d/columnstore.conf
$SUDO rm -f /etc/ld.so.conf.d/columnstore.conf ldconfig
$SUDO ldconfig else
$SUDO rm -f /etc/defaults/columnstore
fi fi
#cleanup .bashrc #cleanup .bashrc