install_easy: full chmod pervertion surive

This commit is contained in:
bol-van 2023-11-19 17:27:02 +03:00
parent 62562bf727
commit 1681de60cf
2 changed files with 8 additions and 2 deletions

View File

@ -5,8 +5,8 @@ require_root()
[ $(id -u) -ne "0" ] && { [ $(id -u) -ne "0" ] && {
echo root is required echo root is required
exe="$EXEDIR/$(basename "$0")" exe="$EXEDIR/$(basename "$0")"
exists sudo && exec sudo "$exe" exists sudo && exec sudo sh "$exe"
exists su && exec su root -c "$exe" exists su && exec su root -c "sh \"$exe\""
echo su or sudo not found echo su or sudo not found
exitp 2 exitp 2
} }

View File

@ -76,6 +76,7 @@ check_bins()
{ {
echo \* checking executables echo \* checking executables
fix_perms_bin_test "$EXEDIR"
local arch=$(get_bin_arch) local arch=$(get_bin_arch)
local make_target local make_target
[ "$FORCE_BUILD" = "1" ] && { [ "$FORCE_BUILD" = "1" ] && {
@ -467,6 +468,11 @@ copy_openwrt()
cp "$BINDIR/tpws" "$BINDIR/nfqws" "$BINDIR/ip2net" "$BINDIR/mdig" "$2/binaries/$ARCH" cp "$BINDIR/tpws" "$BINDIR/nfqws" "$BINDIR/ip2net" "$BINDIR/mdig" "$2/binaries/$ARCH"
} }
fix_perms_bin_test()
{
[ -d "$1" ] || return
find "$1/binaries" -name ip2net -exec chmod +x {} \;
}
fix_perms() fix_perms()
{ {
[ -d "$1" ] || return [ -d "$1" ] || return