Merge pull request #18 from mwarning/rename
authorPaul Spooren <mail@aparcar.org>
Thu, 5 Mar 2020 09:42:03 +0000 (23:42 -1000)
committerGitHub <noreply@github.com>
Thu, 5 Mar 2020 09:42:03 +0000 (23:42 -1000)
rename varaibles 'version' => 'release' and 'commit' => 'code'

1  2 
README.md
index.js
misc/collect.py

diff --cc README.md
index 6d0829e07e74e4f9fe5f32938a115ce4d276670d,1959f1f72bcc2c47fdcfe5c2f37f8d9e0a81cb8e..4284df2ae44413bbd9d22adb0161c28733564669
+++ b/README.md
@@@ -21,9 -21,9 +21,9 @@@ The `names-<version>.json` files are ba
  (master): `Global build settings  ---> [*] Create JSON info files per build
  image`.
  
 -A [Python script](misc/collect.py) is included to create those json files:
 +A [Python script](misc/collect.py) is included to merge the JSON files:
  `./collect.py bin/ --url
- 'https://downloads.openwrt.org/releases/{release}/targets/{target}' >
+ 'https://downloads.openwrt.org/releases/{version}/targets/{target}' >
  names-test.json`.
  
  For the OpenWrt 18.06 and 19.07 releases, you need to patch OpenWrt to output JSON files for collect.py (commit [openwrt/openwrt@881ed09](https://github.com/openwrt/openwrt/commit/881ed09ee6e23f6c224184bb7493253c4624fb9f)).
diff --cc index.js
Simple merge
diff --cc misc/collect.py
Simple merge