Merge pull request #45 from pj8/same-json-format

Same json format
pj8 · Apr 29, 2023 · b4f3fd2 · b4f3fd2
2 parents ceeabd4 + c3d64fa
commit b4f3fd2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/mysql/create.sh b/mysql/create.sh
@@ -82,7 +82,15 @@ normalOutputs="${normalOutputs}MySQL Successfully created. $optName $optVersion
 normalOutputs="${normalOutputs}$commands\n"
 
 jsonOutputs=""
-jsonOutputs="$jsonOutputs{\"message\": \"MySQL Successfully created.\", \"name\": \"$optName\", \"version\": \"$optVersion\", \"port\": \"$optPort\", \"confPath\": \"$dir/datadir/$optName/my.cnf\", \"commands\": $commands}"
+jsonOutputs="$jsonOutputs{
+  \"message\": \"MySQL Successfully created.\",
+  \"name\": \"$optName\",
+  \"type\": \"mysql\",
+  \"version\": \"$optVersion\",
+  \"port\": \"$optPort\",
+  \"dataDir\": \"$dir/datadir/$optName\",
+  \"confPath\": \"$dir/datadir/$optName/my.cnf\"
+}"
 
 # Output
 if [ "$format" = "json" ]; then

diff --git a/mysql/delete.sh b/mysql/delete.sh
@@ -47,7 +47,16 @@ normalOutputs=""
 normalOutputs="${normalOutputs}MySQL Successfully deleted. $optName $optVersion $optPort"
 
 jsonOutputs=""
-jsonOutputs="$jsonOutputs{\"message\": \"MySQL Successfully deleted.\", \"name\": \"$optName\", \"version\": \"$optVersion\", \"port\": \"$optPort\"}"
+jsonOutputs="$jsonOutputs{
+  \"message\": \"MySQL Successfully deleted.\",
+  \"name\": \"$optName\",
+  \"type\": \"mysql\",
+  \"version\": \"$optVersion\",
+  \"port\": \"$optPort\",
+  \"dataDir\": \"$dir/datadir/$optName\",
+  \"confPath\": \"$dir/datadir/$optName/my.cnf\"
+}"
+
 
 # Output
 if [ "$format" = "json" ]; then

diff --git a/mysql/start.sh b/mysql/start.sh
@@ -62,12 +62,11 @@ jsonOutputs=""
 jsonOutputs="$jsonOutputs{
   \"message\": \"MySQL Successfully started.\",
   \"name\": \"$optName\",
+  \"type\": \"mysql\",
   \"version\": \"$optVersion\",
   \"port\": \"$optPort\",
-  \"confPath\": \"$dir/datadir/$optName/my.cnf\",
   \"dataDir\": \"$dir/datadir/$optName\",
-  \"logError\": \"$dir/datadir/$optName/mysqld.err\",
-  \"pidFile\": \"$dir/datadir/$optName/mysql.pid\"
+  \"confPath\": \"$dir/datadir/$optName/my.cnf\"
 }"
 
 # Output

diff --git a/mysql/stop.sh b/mysql/stop.sh
@@ -48,7 +48,15 @@ normalOutputs=""
 normalOutputs="${normalOutputs}MySQL Successfully stopped. $optName $optVersion $optPort"
 
 jsonOutputs=""
-jsonOutputs="$jsonOutputs{\"message\": \"MySQL Successfully stopped.\", \"name\": \"$optName\", \"version\": \"$optVersion\", \"port\": \"$optPort\", \"confPath\": \"$dir/datadir/$optName/my.cnf\"}"
+jsonOutputs="$jsonOutputs{
+  \"message\": \"MySQL Successfully stopped.\",
+  \"name\": \"$optName\",
+  \"type\": \"mysql\",
+  \"version\": \"$optVersion\",
+  \"port\": \"$optPort\",
+  \"dataDir\": \"$dir/datadir/$optName\",
+  \"confPath\": \"$dir/datadir/$optName/my.cnf\"
+}"
 
 # Output
 if [ "$format" = "json" ]; then