Support install dir on mysql

pj8 · May 7, 2023 · d8de5b6 · d8de5b6
1 parent c2f9d9d
commit d8de5b6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/mysql/connect.sh b/mysql/connect.sh
@@ -14,7 +14,8 @@ exitIfNotExistPortFile "$optName" "$optVersion"
 optPort=$(getPortByName "$optName" "$optVersion")
 
 optSocket=/tmp/dbdb_mysql_$optPort.sock
-dir=$currentDir/versions/$optVersion
+installDir=$(getInstallDir $(getType))
+dir=$installDir/versions/$optVersion
 
 exitIfNotExistDir $dir/datadir/$optName
 exitIfNotRunningPort $optPort

diff --git a/mysql/create.sh b/mysql/create.sh
@@ -45,7 +45,11 @@ optPort=$(getOptPort $3)
 optFileName=mysql-${optVersion}-${os}
 optUser=_dbdb_mysql
 optSocket=/tmp/dbdb_mysql_$optPort.sock
-dir=$currentDir/versions/$optVersion
+installDir=$(getInstallDir $(getType))
+dir=$installDir/versions/$optVersion
+
+mkdir -p "$dir"
+cd $dir
 
 exitIfDuplicatedName $optName
 exitIfExistDir $dir/datadir/$optName
@@ -69,11 +73,10 @@ $dir/basedir/bin/mysqld \
 
 echo $optPort >$dir/datadir/$optName/mysql.port.init
 
-echo "#my.cnf" >$dir/datadir/$optName/my.cnf
-echo "[mysqld]" >>$dir/datadir/$optName/my.cnf
-echo "bind-address = 127.0.0.1" >>$dir/datadir/$optName/my.cnf
+echo "#my.cnf" > $dir/datadir/$optName/my.cnf
+echo "[mysqld]" >> $dir/datadir/$optName/my.cnf
+echo "bind-address = 127.0.0.1" >> $dir/datadir/$optName/my.cnf
 
-cd $currentDir
 commands=$(getCommands $optName $optVersion $optPort $format)
 
 normalOutputs=""

diff --git a/mysql/delete.sh b/mysql/delete.sh
@@ -34,7 +34,8 @@ optVersion=$(getVersionByName "$optName")
 exitIfNotExistPortFile "$optName" "$optVersion"
 optPort=$(getPortByName "$optName" "$optVersion")
 
-dir=$currentDir/versions/$optVersion
+installDir=$(getInstallDir $(getType))
+dir=$installDir/versions/$optVersion
 
 ./stop.sh -f "$format" $optName $optVersion $optPort > /dev/null
 

diff --git a/mysql/restart.sh b/mysql/restart.sh
@@ -24,6 +24,7 @@ currentDir="$(
   pwd -P
 )"
 cd $currentDir
+
 ./stop.sh -f "$format" $1 > /dev/null
 
 set -eu

diff --git a/mysql/start.sh b/mysql/start.sh
@@ -37,10 +37,12 @@ optPort=$(getPortByName "$optName" "$optVersion")
 
 optUser=_dbdb_mysql
 optSocket=/tmp/dbdb_mysql_$optPort.sock
-dir=$currentDir/versions/$optVersion
+installDir=$(getInstallDir $(getType))
+dir=$installDir/versions/$optVersion
 
 exitIfNotExistDir $dir/datadir/$optName
 exitIfRunningPort $optPort
+
 $dir/basedir/bin/mysqld \
   --defaults-file=$dir/datadir/$optName/my.cnf \
   --daemonize \
@@ -52,7 +54,7 @@ $dir/basedir/bin/mysqld \
   --datadir=$dir/datadir/$optName \
   --log-error=$dir/datadir/$optName/mysqld.err \
   --pid-file=$dir/datadir/$optName/mysql.pid
-echo $optPort >$dir/datadir/$optName/mysql.port
+echo $optPort > $dir/datadir/$optName/mysql.port
 
 normalOutputs=""
 normalOutputs="${normalOutputs}MySQL Successfully started. $optName $optVersion $optPort\n"

diff --git a/mysql/status.sh b/mysql/status.sh
@@ -36,10 +36,12 @@ exitIfNotExistPortFile "$optName" "$optVersion"
 optPort=$(getPortByName "$optName" "$optVersion")
 
 optSocket=/tmp/dbdb_mysql_$optPort.sock
-dir=$currentDir/versions/$optVersion
+installDir=$(getInstallDir $(getType))
+dir=$installDir/versions/$optVersion
 
 exitIfNotExistDir $dir/datadir/$optName
 exitIfNotRunningPort $optPort
+
 status=$($dir/basedir/bin/mysqladmin --user=root --host=localhost --port=$optPort --socket=$optSocket status)
 
 normalOutputs=""

diff --git a/mysql/stop.sh b/mysql/stop.sh
@@ -36,7 +36,8 @@ exitIfNotExistPortFile "$optName" "$optVersion"
 optPort=$(getPortByName "$optName" "$optVersion")
 
 optSocket=/tmp/dbdb_mysql_$optPort.sock
-dir=$currentDir/versions/$optVersion
+installDir=$(getInstallDir $(getType))
+dir=$installDir/versions/$optVersion
 
 exitIfNotExistDir $dir/datadir/$optName
 exitIfNotRunningPort $optPort