diff --git a/lamp.sh b/lamp.sh index aeeae21..a73d4fc 100644 --- a/lamp.sh +++ b/lamp.sh @@ -15,7 +15,8 @@ shopt -s inherit_errexit 2>/dev/null || true #============================================================================== # Configuration & Constants #============================================================================== -readonly SCRIPT_DIR="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)" +SCRIPT_DIR="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)" +readonly SCRIPT_DIR readonly DEFAULT_DB_PASS="Teddysun.com" readonly LOG_FILE="/var/log/lamp-install.log" @@ -32,8 +33,9 @@ _yellow() { printf '\033[1;33m%b\033[0m' "$1"; } _log() { local level="$1" shift 1 - local message="$@" - local timestamp=$(date) + local message="$*" + local timestamp + timestamp=$(date) echo "[${timestamp}] [${level}] ${message}" | tee -a "${LOG_FILE}" || echo "[${timestamp}] [${level}] ${message}" } @@ -720,6 +722,7 @@ install_phpmyadmin() { install_mariadb() { local mariadb_ver="$1" + # shellcheck disable=SC2034 local -n cnf_path_ref="$2" _info "Setting up MariaDB repository" @@ -754,11 +757,14 @@ install_mariadb() { install_php() { local php_ver="$1" + # shellcheck disable=SC2034 local -n php_conf_ref="$2" + # shellcheck disable=SC2034 local -n php_ini_ref="$3" + # shellcheck disable=SC2034 local -n php_fpm_ref="$4" - local -n php_sock_ref="$5" - local -n sock_location_ref="$6" + # shellcheck disable=SC2034 + local -n sock_location_ref="$5" local is_rhel="false" @@ -767,14 +773,12 @@ install_php() { php_conf_ref="/etc/php-fpm.d/www.conf" php_ini_ref="/etc/php.ini" php_fpm_ref="php-fpm" - php_sock_ref="unix:/run/php-fpm/www.sock" sock_location_ref="/var/lib/mysql/mysql.sock" configure_php_rhel "${php_ver}" elif _check_sys debian || _check_sys ubuntu; then php_conf_ref="/etc/php/${php_ver}/fpm/pool.d/www.conf" php_ini_ref="/etc/php/${php_ver}/fpm/php.ini" php_fpm_ref="php${php_ver}-fpm" - php_sock_ref="unix:/run/php/php-fpm.sock" sock_location_ref="/run/mysqld/mysqld.sock" configure_php_deb "${php_ver}" fi @@ -886,8 +890,8 @@ main() { install_phpmyadmin "${db_pass}" # Install PHP - local php_conf php_ini php_fpm php_sock sock_location - install_php "${php_ver}" php_conf php_ini php_fpm php_sock sock_location + local php_conf php_ini php_fpm sock_location + install_php "${php_ver}" php_conf php_ini php_fpm sock_location # Set permissions set_permissions "${is_rhel}"