Skip to content

Commit

Permalink
Update comments
Browse files Browse the repository at this point in the history 
Signed-off-by: Teddysun <i@teddysun.com>
  • Loading branch information
@teddysun
teddysun committed Apr 11, 2019
1 parent 49862c1 commit 6d46780
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 175 deletions.
16 changes: 8 additions & 8 deletions include/apache.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ install_apache(){
install_nghttp2

cd ${cur_dir}/software/
download_file "${apr_filename}.tar.gz"
download_file "${apr_filename}.tar.gz" "${apr_filename_url}"
tar zxf ${apr_filename}.tar.gz
download_file "${apr_util_filename}.tar.gz"
download_file "${apr_util_filename}.tar.gz" "${apr_util_filename_url}"
tar zxf ${apr_util_filename}.tar.gz
download_file "${apache2_4_filename}.tar.gz"
download_file "${apache2_4_filename}.tar.gz" "${apache2_4_filename_url}"
tar zxf ${apache2_4_filename}.tar.gz
cd ${apache2_4_filename}
mv ${cur_dir}/software/${apr_filename} srclib/apr
Expand Down Expand Up @@ -240,7 +240,7 @@ install_apache_modules(){
install_nghttp2(){
cd ${cur_dir}/software/
log "Info" "${nghttp2_filename} install start..."
download_file "${nghttp2_filename}.tar.gz"
download_file "${nghttp2_filename}.tar.gz" "${nghttp2_filename_url}"
tar zxf ${nghttp2_filename}.tar.gz
cd ${nghttp2_filename}

Expand All @@ -262,7 +262,7 @@ install_openssl(){
if version_lt ${major_version} 1.1.1; then
cd ${cur_dir}/software/
log "Info" "${openssl_filename} install start..."
download_file "${openssl_filename}.tar.gz"
download_file "${openssl_filename}.tar.gz" "${openssl_filename_url}"
tar zxf ${openssl_filename}.tar.gz
cd ${openssl_filename}

Expand All @@ -283,7 +283,7 @@ install_openssl(){
install_mod_wsgi(){
cd ${cur_dir}/software/
log "Info" "${mod_wsgi_filename} install start..."
download_file "${mod_wsgi_filename}.tar.gz"
download_file "${mod_wsgi_filename}.tar.gz" "${mod_wsgi_filename_url}"
tar zxf ${mod_wsgi_filename}.tar.gz
cd ${mod_wsgi_filename}

Expand All @@ -301,7 +301,7 @@ install_mod_wsgi(){
install_mod_jk(){
cd ${cur_dir}/software/
log "Info" "${mod_jk_filename} install start..."
download_file "${mod_jk_filename}.tar.gz"
download_file "${mod_jk_filename}.tar.gz" "${mod_jk_filename_url}"
tar zxf ${mod_jk_filename}.tar.gz
cd ${mod_jk_filename}/native

Expand All @@ -319,7 +319,7 @@ install_mod_jk(){
install_mod_security(){
cd ${cur_dir}/software/
log "Info" "${mod_security_filename} install start..."
download_file "${mod_security_filename}.tar.gz"
download_file "${mod_security_filename}.tar.gz" "${mod_security_filename_url}"
tar zxf ${mod_security_filename}.tar.gz
cd ${mod_security_filename}

Expand Down
65 changes: 28 additions & 37 deletions include/mysql.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ common_setup(){
rm -f /usr/bin/mysql /usr/bin/mysqldump /usr/bin/mysqladmin
rm -f /etc/ld.so.conf.d/mysql.conf

if [ -d ${mysql_location} ]; then
if [ -d "${mysql_location}" ]; then

local db_name="MySQL"
local db_pass="${mysql_root_pass}"
Expand All @@ -251,7 +251,7 @@ common_setup(){
echo "${mysql_location}/lib" >> /etc/ld.so.conf.d/mysql.conf
echo "${mysql_location}/lib64" >> /etc/ld.so.conf.d/mysql.conf

elif [ -d ${mariadb_location} ]; then
elif [ -d "${mariadb_location}" ]; then

local db_name="MariaDB"
local db_pass="${mariadb_root_pass}"
Expand All @@ -265,7 +265,7 @@ common_setup(){
echo "${mariadb_location}/lib" >> /etc/ld.so.conf.d/mysql.conf
echo "${mariadb_location}/lib64" >> /etc/ld.so.conf.d/mysql.conf

elif [ -d ${percona_location} ]; then
elif [ -d "${percona_location}" ]; then

local db_name="Percona Server"
local db_pass="${percona_root_pass}"
Expand Down Expand Up @@ -318,22 +318,20 @@ install_mysqld(){
mysql_ver=$(echo ${mysql} | sed 's/[^0-9.]//g' | cut -d. -f1-2)
cd ${cur_dir}/software/
log "Info" "Downloading and Extracting MySQL files..."

mysql_filename="${mysql}-linux-glibc2.12-${sys_bit}"
if [ "${mysql_ver}" == "8.0" ]; then
url1="https://cdn.mysql.com/Downloads/MySQL-${mysql_ver}/${mysql}-linux-glibc2.12-${sys_bit}.tar.xz"
url2="${download_root_url}/${mysql}-linux-glibc2.12-${sys_bit}.tar.xz"
mysql_file="${mysql}-linux-glibc2.12-${sys_bit}.tar.xz"
download_from_url "${mysql_file}" "${url1}" "${url2}"
tar Jxf ${mysql_file}
mysql_filename_url="https://cdn.mysql.com/Downloads/MySQL-${mysql_ver}/${mysql_filename}.tar.xz"
download_file "${mysql_filename}.tar.xz" "${mysql_filename_url}"
tar Jxf ${mysql_filename}.tar.xz
else
url1="https://cdn.mysql.com/Downloads/MySQL-${mysql_ver}/${mysql}-linux-glibc2.12-${sys_bit}.tar.gz"
url2="${download_root_url}/${mysql}-linux-glibc2.12-${sys_bit}.tar.gz"
mysql_file="${mysql}-linux-glibc2.12-${sys_bit}.tar.gz"
download_from_url "${mysql_file}" "${url1}" "${url2}"
tar zxf ${mysql_file}
mysql_filename_url="https://cdn.mysql.com/Downloads/MySQL-${mysql_ver}/${mysql_filename}.tar.gz"
download_file "${mysql_filename}.tar.gz" "${mysql_filename_url}"
tar zxf ${mysql_filename}.tar.gz
fi

log "Info" "Moving MySQL files..."
mv ${mysql}-linux-glibc2.12-${sys_bit}/* ${mysql_location}
mv ${mysql_filename}/* ${mysql_location}

config_mysql ${mysql_ver}

Expand Down Expand Up @@ -372,14 +370,6 @@ install_mariadb(){

common_install

if [ "$(get_ip_country)" == "CN" ]; then
local down_addr1=http://mirrors.aliyun.com/mariadb/
local down_addr2=http://sfo1.mirrors.digitalocean.com/mariadb/
else
local down_addr1=http://sfo1.mirrors.digitalocean.com/mariadb/
local down_addr2=http://mirrors.aliyun.com/mariadb/
fi

if version_lt $(get_libc_version) 2.14; then
glibc_flag=linux
else
Expand All @@ -389,16 +379,20 @@ install_mariadb(){
is_64bit && sys_bit_a=x86_64 || sys_bit_a=x86
is_64bit && sys_bit_b=x86_64 || sys_bit_b=i686

cd ${cur_dir}/software/
mariadb_filename="${mysql}-${glibc_flag}-${sys_bit_b}"
if [ "$(get_ip_country)" == "CN" ]; then
mariadb_filename_url="http://mirrors.aliyun.com/mariadb/${mysql}/bintar-${glibc_flag}-${sys_bit_a}/${mariadb_filename}.tar.gz"
else
mariadb_filename_url="http://sfo1.mirrors.digitalocean.com/mariadb/${mysql}/bintar-${glibc_flag}-${sys_bit_a}/${mariadb_filename}.tar.gz"
fi

download_from_url "${mysql}-${glibc_flag}-${sys_bit_b}.tar.gz" \
"${down_addr1}/${mysql}/bintar-${glibc_flag}-${sys_bit_a}/${mysql}-${glibc_flag}-${sys_bit_b}.tar.gz" \
"${down_addr2}/${mysql}/bintar-${glibc_flag}-${sys_bit_a}/${mysql}-${glibc_flag}-${sys_bit_b}.tar.gz"
cd ${cur_dir}/software/
download_file "${mariadb_filename}.tar.gz" "${mariadb_filename_url}"

log "Info" "Extracting MariaDB files..."
tar zxf ${mysql}-${glibc_flag}-${sys_bit_b}.tar.gz
tar zxf ${mariadb_filename}.tar.gz
log "Info" "Moving MariaDB files..."
mv ${mysql}-*-${sys_bit_b}/* ${mariadb_location}
mv ${mariadb_filename}/* ${mariadb_location}

config_mariadb

Expand Down Expand Up @@ -449,22 +443,19 @@ install_percona(){
local down_addr="https://www.percona.com/downloads/Percona-Server-${percona_ver}/${mysql}/binary/tarball"

if [[ "${percona_ver}" == "5.5" || "${percona_ver}" == "5.6" ]]; then
tarball="${major_ver}-rel${rel_ver}-Linux.${sys_bit}.${ssl_ver}"
percona_filename="${major_ver}-rel${rel_ver}-Linux.${sys_bit}.${ssl_ver}"
fi
if [[ "${percona_ver}" == "5.7" || "${percona_ver}" == "8.0" ]]; then
tarball="${mysql}-Linux.${sys_bit}.${ssl_ver}"
percona_filename="${mysql}-Linux.${sys_bit}.${ssl_ver}"
fi

local url1="${down_addr}/${tarball}.tar.gz"
local url2="${download_root_url}/${tarball}.tar.gz"
percona_filename_url="${down_addr}/${percona_filename}.tar.gz"

cd ${cur_dir}/software/

download_from_url "${tarball}.tar.gz" "${url1}" "${url2}"
download_file "${percona_filename}.tar.gz" "${percona_filename_url}"
log "Info" "Extracting Percona Server files..."
tar zxf ${tarball}.tar.gz
tar zxf ${percona_filename}.tar.gz
log "Info" "Moving Percona Server files..."
mv ${tarball}/* ${percona_location}
mv ${percona_filename}/* ${percona_location}

config_percona ${percona_ver}

Expand Down
Loading

0 comments on commit 6d46780

Please sign in to comment.