update libsodium & libmbedtls install prefix
Signed-off-by: Teddysun <i@teddysun.com>
This commit is contained in:
parent
b5fb93e78a
commit
9929effac2
|
|
@ -490,11 +490,11 @@ install_prepare() {
|
||||||
}
|
}
|
||||||
|
|
||||||
install_libsodium() {
|
install_libsodium() {
|
||||||
if [ ! -f /usr/local/lib/libsodium.a ]; then
|
if [ ! -f /usr/lib/libsodium.a ]; then
|
||||||
cd ${cur_dir}
|
cd ${cur_dir}
|
||||||
tar zxf ${libsodium_file}.tar.gz
|
tar zxf ${libsodium_file}.tar.gz
|
||||||
cd ${libsodium_file}
|
cd ${libsodium_file}
|
||||||
./configure && make && make install
|
./configure --prefix=/usr && make && make install
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo -e "${red}Error:${plain} ${libsodium_file} install failed."
|
echo -e "${red}Error:${plain} ${libsodium_file} install failed."
|
||||||
install_cleanup
|
install_cleanup
|
||||||
|
|
@ -503,17 +503,18 @@ install_libsodium() {
|
||||||
else
|
else
|
||||||
echo -e "${green}Info:${plain} ${libsodium_file} already installed."
|
echo -e "${green}Info:${plain} ${libsodium_file} already installed."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf
|
|
||||||
ldconfig
|
|
||||||
}
|
}
|
||||||
|
|
||||||
install_mbedtls() {
|
install_mbedtls() {
|
||||||
cd ${cur_dir}
|
if [ ! -f /usr/lib/libmbedtls.a ]; then
|
||||||
tar xf ${mbedtls_file}-gpl.tgz
|
cd ${cur_dir}
|
||||||
cd ${mbedtls_file}
|
tar xf ${mbedtls_file}-gpl.tgz
|
||||||
make SHARED=1 CFLAGS=-fPIC
|
cd ${mbedtls_file}
|
||||||
make install
|
make SHARED=1 CFLAGS=-fPIC
|
||||||
|
make DESTDIR=/usr install
|
||||||
|
else
|
||||||
|
echo -e "${green}Info:${plain} ${mbedtls_file} already installed."
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
install_shadowsocks_python() {
|
install_shadowsocks_python() {
|
||||||
|
|
|
||||||
|
|
@ -254,13 +254,9 @@ pre_install(){
|
||||||
download_files(){
|
download_files(){
|
||||||
cd ${cur_dir}
|
cd ${cur_dir}
|
||||||
|
|
||||||
if [ -f ${shadowsocks_libev_ver}.tar.gz ]; then
|
if ! wget --no-check-certificate -O ${shadowsocks_libev_ver}.tar.gz ${download_link}; then
|
||||||
echo "${shadowsocks_libev_ver}.tar.gz [found]"
|
echo "Failed to download ${shadowsocks_libev_ver}.tar.gz"
|
||||||
else
|
exit 1
|
||||||
if ! wget --no-check-certificate -O ${shadowsocks_libev_ver}.tar.gz ${download_link}; then
|
|
||||||
echo "Failed to download ${shadowsocks_libev_ver}.tar.gz"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! wget --no-check-certificate -O ${libsodium_file}.tar.gz ${libsodium_url}; then
|
if ! wget --no-check-certificate -O ${libsodium_file}.tar.gz ${libsodium_url}; then
|
||||||
|
|
@ -305,25 +301,26 @@ EOF
|
||||||
|
|
||||||
# Install Shadowsocks-libev
|
# Install Shadowsocks-libev
|
||||||
install_shadowsocks(){
|
install_shadowsocks(){
|
||||||
if [ ! -f /usr/local/lib/libsodium.a ]; then
|
if [ ! -f /usr/lib/libsodium.a ]; then
|
||||||
cd ${cur_dir}
|
cd ${cur_dir}
|
||||||
tar zxf ${libsodium_file}.tar.gz
|
tar zxf ${libsodium_file}.tar.gz
|
||||||
cd ${libsodium_file}
|
cd ${libsodium_file}
|
||||||
./configure && make && make install
|
./configure --prefix=/usr && make && make install
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "${libsodium_file} install failed!"
|
echo "${libsodium_file} install failed!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf
|
if [ ! -f /usr/lib/libmbedtls.a ]; then
|
||||||
ldconfig
|
cd ${cur_dir}
|
||||||
|
tar xf ${mbedtls_file}-gpl.tgz
|
||||||
|
cd ${mbedtls_file}
|
||||||
|
make SHARED=1 CFLAGS=-fPIC
|
||||||
|
make DESTDIR=/usr install
|
||||||
|
fi
|
||||||
|
|
||||||
cd ${cur_dir}
|
ldconfig
|
||||||
tar xf ${mbedtls_file}-gpl.tgz
|
|
||||||
cd ${mbedtls_file}
|
|
||||||
make SHARED=1 CFLAGS=-fPIC
|
|
||||||
make install
|
|
||||||
|
|
||||||
cd ${cur_dir}
|
cd ${cur_dir}
|
||||||
tar zxf ${shadowsocks_libev_ver}.tar.gz
|
tar zxf ${shadowsocks_libev_ver}.tar.gz
|
||||||
|
|
|
||||||
|
|
@ -253,13 +253,9 @@ pre_install(){
|
||||||
download_files(){
|
download_files(){
|
||||||
cd ${cur_dir}
|
cd ${cur_dir}
|
||||||
|
|
||||||
if [ -f ${shadowsocks_libev_ver}.tar.gz ]; then
|
if ! wget --no-check-certificate -O ${shadowsocks_libev_ver}.tar.gz ${download_link}; then
|
||||||
echo "${shadowsocks_libev_ver}.tar.gz [found]"
|
echo "Failed to download ${shadowsocks_libev_ver}.tar.gz"
|
||||||
else
|
exit 1
|
||||||
if ! wget --no-check-certificate -O ${shadowsocks_libev_ver}.tar.gz ${download_link}; then
|
|
||||||
echo "Failed to download ${shadowsocks_libev_ver}.tar.gz"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! wget --no-check-certificate -O ${libsodium_file}.tar.gz ${libsodium_url}; then
|
if ! wget --no-check-certificate -O ${libsodium_file}.tar.gz ${libsodium_url}; then
|
||||||
|
|
@ -338,20 +334,18 @@ firewall_set(){
|
||||||
|
|
||||||
# Install Shadowsocks-libev
|
# Install Shadowsocks-libev
|
||||||
install_shadowsocks(){
|
install_shadowsocks(){
|
||||||
if [ ! -f /usr/local/lib/libsodium.a ]; then
|
if [ ! -f /usr/lib/libsodium.a ]; then
|
||||||
cd ${cur_dir}
|
cd ${cur_dir}
|
||||||
tar zxf ${libsodium_file}.tar.gz
|
tar zxf ${libsodium_file}.tar.gz
|
||||||
cd ${libsodium_file}
|
cd ${libsodium_file}
|
||||||
./configure && make && make install
|
./configure --prefix=/usr && make && make install
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "${libsodium_file} install failed!"
|
echo "${libsodium_file} install failed!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf
|
|
||||||
ldconfig
|
ldconfig
|
||||||
|
|
||||||
cd ${cur_dir}
|
cd ${cur_dir}
|
||||||
tar zxf ${shadowsocks_libev_ver}.tar.gz
|
tar zxf ${shadowsocks_libev_ver}.tar.gz
|
||||||
cd ${shadowsocks_libev_ver}
|
cd ${shadowsocks_libev_ver}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user