Merge pull request #6 from ZarTek-Creole/master

Author: 2rebi

install.sh

@@ -1,25 +1,78 @@
-if [[ $# > 0 ]]; then
+# Determine the name of the MySQL/MariaDB configuration command
+get_mysql_config_cmd() {
     version_info=$(mysql --version)
     if [[ "$version_info" == *"Maria"* ]]; then
-        include_dir=$(mariadb_config --include)
+        echo "mariadb_config"
     else
-        include_dir=$(mysql_config --include)
+        echo "mysql_config"
     fi
+}
 
-    sql_result=$(mysql --user=$1 --password=$2 -s -N -e "SHOW VARIABLES LIKE 'plugin_dir';")
-    plugin_dir=$(cut -d" " -f2 <<< $sql_result)
+# Retrieve the directory containing MySQL/MariaDB header files
+get_include_dir() {
+    local mysql_config_cmd
+    mysql_config_cmd=$(get_mysql_config_cmd)
+    $mysql_config_cmd --include
+}
+
+# Retrieve the MySQL/MariaDB plugin directory
+get_plugin_dir() {
+    local username=$1
+    local password=$2
+    local sql_result
+    sql_result=$(mysql --user=$username --password=$password -s -N -e "SHOW VARIABLES LIKE 'plugin_dir';")
+    cut -d" " -f2 <<< $sql_result
+}
+
+# Execute a MySQL/MariaDB command
+execute_mysql_cmd() {
+    local username=$1
+    local password=$2
+    local command=$3
+    mysql --user=$username --password=$password -s -N -e "$command"
+}
+
+# Compile and install the HTTP plugin
+install_http_plugin() {
+    local username=$1
+    local password=$2
+    local include_dir
+    include_dir=$(get_include_dir)
+    local plugin_dir
+    plugin_dir=$(get_plugin_dir $username $password)
 
     export CGO_CFLAGS=$include_dir
-    go build -buildmode=c-shared -o $plugin_dir"http.so" http.go
-    rm $plugin_dir"http.h"
+    go build -buildmode=c-shared -o "$plugin_dir/http.so" http.go
+    rm "$plugin_dir/http.h"
+}
 
-    mysql --user=$1 --password=$2 -s -N -e "CREATE OR REPLACE FUNCTION http_help RETURNS STRING SONAME 'http.so';"
-    mysql --user=$1 --password=$2 -s -N -e "CREATE OR REPLACE FUNCTION http_raw RETURNS STRING SONAME 'http.so';"
-    mysql --user=$1 --password=$2 -s -N -e "CREATE OR REPLACE FUNCTION http_get RETURNS STRING SONAME 'http.so';"
-    mysql --user=$1 --password=$2 -s -N -e "CREATE OR REPLACE FUNCTION http_post RETURNS STRING SONAME 'http.so';"
+# Create MySQL/MariaDB functions for the HTTP plugin
+create_http_functions() {
+    local username=$1
+    local password=$2
+    execute_mysql_cmd $username $password "CREATE OR REPLACE FUNCTION http_help RETURNS STRING SONAME 'http.so';"
+    execute_mysql_cmd $username $password "CREATE OR REPLACE FUNCTION http_raw RETURNS STRING SONAME 'http.so';"
+    execute_mysql_cmd $username $password "CREATE OR REPLACE FUNCTION http_get RETURNS STRING SONAME 'http.so';"
+    execute_mysql_cmd $username $password "CREATE OR REPLACE FUNCTION http_post RETURNS STRING SONAME 'http.so';"
+}
 
-    echo "Install Success"
-else
-    echo "bash install.sh username password(optional)"
+# Check if the script was called with at least one argument (username)
+if [[ $# -lt 1 ]]; then
+    echo "Error: you must specify the MySQL/MariaDB username as an argument."
+    echo "Usage: bash install.sh username [password]"
+    exit 1
 fi
 
+# Retrieve
+# Retrieve the username and password (optional)
+username=$1
+password=
+if [[ $# -gt 1 ]]; then
+    password=$2
+fi
+
+# Install the HTTP plugin and create the MySQL/MariaDB functions
+install_http_plugin $username $password
+create_http_functions $username $password
+
+echo "Installation successful"