drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-04-19 13:32:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

install_easy : fix compilation in nondefault location

Browse Source
This commit is contained in:
bolvan 2019-05-22 10:40:05 +03:00
parent 90454f386b
commit 502abff2b5
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
install_easy.sh
View File

@ -83,20 +83,29 @@ check_system()
echo system is based on $SYSTEM echo system is based on $SYSTEM
} }
call_install_bin() check_bins()
{ {
"$EXEDIR/install_bin.sh" $1 || { echo \* checking executables
echo binaries compatible with your system not found
if exists make; then local arch=$(get_bin_arch)
if [ -n "$arch" ] ; then
echo found. architecture is : "\"$arch\""
elif exists make; then
echo trying to compile echo trying to compile
make -C "$EXEDIR" || { make -C "$EXEDIR" || {
echo could not compile echo could not compile
exitp 8 exitp 8
} }
echo compiled
else else
echo build tools not found
exitp 8 exitp 8
fi fi
} }
call_install_bin()
{
"$EXEDIR/install_bin.sh" $1
} }
get_bin_arch() get_bin_arch()
{ {
@ -107,7 +116,10 @@ install_binaries()
{ {
echo \* installing binaries echo \* installing binaries
call_install_bin call_install_bin || {
echo compatible binaries not found
exitp 8
}
} }
find_str_in_list() find_str_in_list()
@ -455,6 +467,7 @@ install_systemd()
{ {
INIT_SCRIPT_SRC=$EXEDIR/init.d/sysv/zapret INIT_SCRIPT_SRC=$EXEDIR/init.d/sysv/zapret
check_bins
check_location copy_all check_location copy_all
check_prerequisites_linux check_prerequisites_linux
service_stop_systemd service_stop_systemd
@ -672,6 +685,7 @@ install_openwrt()
OPENWRT_FW_INCLUDE=/etc/firewall.zapret OPENWRT_FW_INCLUDE=/etc/firewall.zapret
OPENWRT_IFACE_HOOK=$EXEDIR/init.d/openwrt/90-zapret OPENWRT_IFACE_HOOK=$EXEDIR/init.d/openwrt/90-zapret
check_bins
check_location copy_minimal check_location copy_minimal
select_ipv6 select_ipv6
check_prerequisites_openwrt check_prerequisites_openwrt