mirror/openwrt-packages
1
0
Fork 0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-14 19:33:59 +02:00
Code Releases Activity

Merge pull request #15052 from stangri/master-vpn-policy-routing

Browse Source 
vpn-policy-routing: better processing of custom user files
This commit is contained in:
Rosen Penev 2021-03-08 12:26:11 -08:00 committed by GitHub
commit bd910968cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/vpn-policy-routing/Makefile
View File

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vpn-policy-routing PKG_NAME:=vpn-policy-routing
PKG_VERSION:=0.3.2 PKG_VERSION:=0.3.2
PKG_RELEASE:=18 PKG_RELEASE:=20
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>

15
net/vpn-policy-routing/files/vpn-policy-routing.init
View File

@ -89,6 +89,7 @@ output() {
printf "%b" "$msg" >> "$sharedMemoryOutput" printf "%b" "$msg" >> "$sharedMemoryOutput"
fi fi
} }
is_present() { command -v "$1" >/dev/null 2>&1; }
is_installed() { [ -s "/usr/lib/opkg/info/${1}.control" ]; } is_installed() { [ -s "/usr/lib/opkg/info/${1}.control" ]; }
is_variant_installed() { [ "$(echo /usr/lib/opkg/info/"${1}"*.control)" != "/usr/lib/opkg/info/${1}*.control" ]; } is_variant_installed() { [ "$(echo /usr/lib/opkg/info/"${1}"*.control)" != "/usr/lib/opkg/info/${1}*.control" ]; }
@ -867,22 +868,26 @@ process_user_file(){
config_get path "$1" 'path' config_get path "$1" 'path'
[ "$enabled" -gt 0 ] || return 0 [ "$enabled" -gt 0 ] || return 0
if [ ! -s "$path" ]; then if [ ! -s "$path" ]; then
errorSummary="${errorSummary}${_ERROR_}: Custom user file '$path' not found or empty\\n" errorSummary="${errorSummary}${_ERROR_}: Custom user file '$path' not found or empty!\\n"
output_fail output_fail
return 1 return 1
fi fi
if ! $shellBin -n "$path"; then if ! $shellBin -n "$path"; then
errorSummary="${errorSummary}${_ERROR_}: Syntax error in custom user file '$path'\\n" errorSummary="${errorSummary}${_ERROR_}: Syntax error in custom user file '$path'!\\n"
output_fail output_fail
return 1 return 1
fi fi
output 2 "Running $path "
# shellcheck disable=SC1090 # shellcheck disable=SC1090
if ! . "$path"; then if ! . "$path"; then
errorSummary="${errorSummary}${_ERROR_}: Error running custom user file '$path'\\n" errorSummary="${errorSummary}${_ERROR_}: Error running custom user file '$path'!\\n"
if grep -q -w 'curl' "$path" && ! is_present 'curl'; then
errorSummary="${errorSummary}${_ERROR_}: Use of 'curl' is detected in custom user file '$path', but 'curl' isn't installed!\\n"
errorSummary="${errorSummary}${_ERROR_}: If 'curl' is needed, install it with 'opkg update; opkg install curl;' command in CLI.\\n"
fi
output_fail output_fail
return 1 return 1
else else
output 2 "Running $path "
output_ok output_ok
return 0 return 0
fi fi
@ -1174,7 +1179,7 @@ support() {
} | tee -a /var/${packageName}-support } | tee -a /var/${packageName}-support
if [ -n "$set_p" ]; then if [ -n "$set_p" ]; then
printf "%b" "Pasting to paste.ee... " printf "%b" "Pasting to paste.ee... "
if is_installed 'curl' && is_variant_installed 'libopenssl' && is_installed 'ca-bundle'; then if is_present 'curl' && is_variant_installed 'libopenssl' && is_installed 'ca-bundle'; then
json_init; json_add_string "description" "${packageName}-support" json_init; json_add_string "description" "${packageName}-support"
json_add_array "sections"; json_add_object '0' json_add_array "sections"; json_add_object '0'
json_add_string "name" "$(uci -q get system.@system[0].hostname)" json_add_string "name" "$(uci -q get system.@system[0].hostname)"