From 6f80db01057b318be8be991a7e4971ca411b17a0 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Wed, 13 Oct 2021 01:09:49 +0200 Subject: [PATCH] fix: $FirstInternalView not set in debian when only one entry in $InternalViews; debian sed handles overhang reference different to openwrt Signed-off-by: Blackyfff --- usr/lib/ffdns/update-dns-functions.sh | 4 ++-- usr/lib/ffdns/update-dns.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/lib/ffdns/update-dns-functions.sh b/usr/lib/ffdns/update-dns-functions.sh index 65a9e46..c64deb8 100755 --- a/usr/lib/ffdns/update-dns-functions.sh +++ b/usr/lib/ffdns/update-dns-functions.sh @@ -54,7 +54,7 @@ UpdateMasterZone() { if [ $((PostFetchMasterSerial)) -le $((LocalMasterSerial)) ]; then LocalMasterSerial=$((LocalMasterSerial+1)) - sed -i -e 's/^\(\s*\)'"$PostFetchMasterSerial"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalMasterSerial"'\3/g' "$CachedMasterFile""I" + sed -i -e 's/^\(\s*\)'"$PostFetchMasterSerial"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalMasterSerial"'\2/g' "$CachedMasterFile""I" sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$PostFetchMasterSerial"'\(\s\+.*\)$/\1'"$LocalMasterSerial"'\3/g' "$CachedMasterFile""I" else LocalMasterSerial=$((PostFetchMasterSerial)) @@ -105,7 +105,7 @@ UpdateExternal() { if [ $((SerialIntern)) -le $((LocalExtDomainMasterSerial)) ]; then LocalExtDomainMasterSerial=$((LocalExtDomainMasterSerial+1)) - sed -i -e 's/^\(\s*\)'"$SerialIntern"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedZoneFile" + sed -i -e 's/^\(\s*\)'"$SerialIntern"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalExtDomainMasterSerial"'\2/g' "$CachedZoneFile" sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$SerialIntern"'\(\s\+.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedZoneFile" fi mv "$CachedZoneFile" "$ExtDomainFile" diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index f9ba302..9bbeda7 100755 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -28,7 +28,7 @@ if [ -n "$CommunityExternPrefix" ];then [ -z "$SubCommunityDomain" ] || MasterExternDomain="$SubCommunityDomain"".""$MasterExternDomain" fi -FirstInternalView="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')" +FirstInternalView="$( echo "$InternalViews" | sed -e 's/\s.*//')" # ForwardZones: "/" ; optionaly multiple " ""/" no spaces in full filename ForwardZones="$MasterDomain""/""$ZoneFilesFolder""db.""$FirstInternalView"".""$MasterDomain" BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf"