Skip to content

Commit

Permalink
framework: add jsonlint target (#3936)
Browse files Browse the repository at this point in the history
And lint json files
  • Loading branch information
publicarray committed Apr 10, 2020
1 parent 159d5ba commit 4053f1d
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 13 deletions.
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@ cross-digests:
(cd $${cross} && $(MAKE) digests) ; \
done

jsonlint:
ifeq (,$(shell which jsonlint))
$(error "jsonlint not found, install with: npm install -g jsonlint")
else
find spk/ -not -path "*work*" -regextype posix-extended -regex '.*(\.json|install_uifile\w*|upgrade_uifile\w*|app/config)' -print -exec jsonlint -q -c {} \;
endif
lint: jsonlint

.PHONY: toolchains kernel-modules
toolchains: $(addprefix toolchain-,$(AVAILABLE_ARCHS))
kernel-modules: $(addprefix kernel-,$(AVAILABLE_ARCHS))
Expand Down
2 changes: 1 addition & 1 deletion spk/flexget/src/wizard/install_uifile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validator": {
"allowBlank": false
}
]
}]
}]
}, {
"step_title": "Attention! DSM6 Permissions",
Expand Down
2 changes: 1 addition & 1 deletion spk/flexget/src/wizard/install_uifile_enu
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validator": {
"allowBlank": false
}
]
}]
}]
}, {
"step_title": "Attention! DSM6 Permissions",
Expand Down
4 changes: 1 addition & 3 deletions spk/horde/src/wizard/install_uifile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
}, {
"step_title": "Horde installation instructions",
"items": [{
"desc": "Horde installation will continue in the background. It will download 25 to 30 MB and will take 10 to 20 minutes.<br/><br/>
Check documentation at wiki.horde.org to find out how to configure Horde. (SQL authentication is recommended.)<br/><br/>
Note: Horde service doesn't have to \"run\" to be accessible. It's only required for Mailer (notifications) to work but SMTP Server has to be configured."
"desc": "Horde installation will continue in the background. It will download 25 to 30 MB and will take 10 to 20 minutes.<br/><br/>Check documentation at wiki.horde.org to find out how to configure Horde. (SQL authentication is recommended.)<br/><br/>Note: Horde service doesn't have to \"run\" to be accessible. It's only required for Mailer (notifications) to work but SMTP Server has to be configured."
}]
}]
4 changes: 1 addition & 3 deletions spk/horde/src/wizard/install_uifile_enu
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
}, {
"step_title": "Horde installation instructions",
"items": [{
"desc": "Horde installation will continue in the background. It will download 25 to 30 MB and will take 10 to 20 minutes.<br/><br/>
Check documentation at wiki.horde.org to find out how to configure Horde. (SQL authentication is recommended.)<br/><br/>
Note: Horde service doesn't have to \"run\" to be accessible. It's only required for Mailer (notifications) to work but SMTP Server has to be configured."
"desc": "Horde installation will continue in the background. It will download 25 to 30 MB and will take 10 to 20 minutes.<br/><br/>Check documentation at wiki.horde.org to find out how to configure Horde. (SQL authentication is recommended.)<br/><br/>Note: Horde service doesn't have to \"run\" to be accessible. It's only required for Mailer (notifications) to work but SMTP Server has to be configured."
}]
}]
2 changes: 1 addition & 1 deletion spk/htpcmanager/src/wizard/install_uifile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validator": {
"allowBlank": false
}
]
}]
}]
}, {
"step_title": "Attention! DSM6 Permissions",
Expand Down
2 changes: 1 addition & 1 deletion spk/htpcmanager/src/wizard/install_uifile_enu
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validator": {
"allowBlank": false
}
]
}]
}]
}, {
"step_title": "Attention! DSM6 Permissions",
Expand Down
2 changes: 1 addition & 1 deletion spk/htpcmanager/src/wizard/install_uifile_fre
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"validator": {
"allowBlank": false
}
]
}]
}]
}]
2 changes: 1 addition & 1 deletion spk/subliminal/src/wizard/install_uifile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validator": {
"allowBlank": false
}
]
}]
}]
}, {
"step_title": "Attention! DSM6 Permissions",
Expand Down
2 changes: 1 addition & 1 deletion spk/subliminal/src/wizard/install_uifile_enu
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validator": {
"allowBlank": false
}
]
}]
}]
}, {
"step_title": "Attention! DSM6 Permissions",
Expand Down

0 comments on commit 4053f1d

Please sign in to comment.