Merge pull request #20532 from stangri/master-simple-adblock

simple-adblock: bugfix: ensure directory for jsonFile is created
This commit is contained in:
Stan Grishin 2023-02-19 19:52:47 -07:00 committed by GitHub
commit dc77446ae0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock
PKG_VERSION:=1.9.4
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later

View file

@ -409,7 +409,7 @@ load_environment() {
;;
esac
for i in "$outputFile" "$outputCache" "$outputGzip"; do
for i in "$jsonFile" "$outputFile" "$outputCache" "$outputGzip"; do
if ! mkdir -p "$(dirname "$i")"; then
if [ "$param" != 'quiet' ]; then
json add error "errorOutputDirCreate" "$i"
@ -668,6 +668,7 @@ json() {
json_add_string reload "$reload"
json_add_string restart "$restart"
json_close_object
mkdir -p "$(dirname "$jsonFile")"
json_dump > "$jsonFile"
sync
}