Merge branch 'master' into next

This commit is contained in:
ccd0 2019-04-05 19:35:47 -07:00
commit edc8cf6d35
18 changed files with 28 additions and 16 deletions

View File

@ -4,6 +4,9 @@
### v1.14.6
**v1.14.6.7** *(2019-04-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.7/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.7/builds/4chan-X-noupdate.crx)]
- Update .crx files to CRX3. This should fix the errors when attempting to install them on newer versions of Chromium.
**v1.14.6.6** *(2019-04-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.6/builds/4chan-X-noupdate.crx)]
- Sauce: Update DeviantArt filename format. #2237
- Sauce: Replace unmatched regex groups with empty string, not 'undefined'

View File

@ -192,8 +192,8 @@ testbuilds/$(name)$1.crx.zip : \
package.json version.json tools/zip-crx.js node_modules/jszip/package.json
node tools/zip-crx.js $1
testbuilds/$(name)$1.crx : testbuilds/$(name)$1.crx.zip package.json tools/sign.js node_modules/node-rsa/package.json
node tools/sign.js $1
testbuilds/$(name)$1.crx : $(foreach f,$(crx_contents),testbuilds/crx$1/$(f)) version.json tools/sign.sh | tmp
tools/sign.sh $1
testbuilds/$(name)$1.meta.js : src/meta/metadata.js src/meta/icon48.png version.json src/Archive/archives.json $(template_deps) | testbuilds
$(template) $$< $$@ type=userscript channel=$1

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
// @version 1.14.6.6
// @version 1.14.6.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
// @version 1.14.6.6
// @version 1.14.6.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -198,7 +198,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.6.6',
VERSION: '1.14.6.7',
NAMESPACE: '4chan X.',
boards: {}
};

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.14.6.6
// @version 1.14.6.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -198,7 +198,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.6.6',
VERSION: '1.14.6.7',
NAMESPACE: '4chan X.',
boards: {}
};

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.14.6.6
// @version 1.14.6.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.14.6.6
// @version 1.14.6.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -198,7 +198,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.6.6',
VERSION: '1.14.6.7',
NAMESPACE: '4chan X.',
boards: {}
};

Binary file not shown.

View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
"version": "1.14.6.6",
"version": "1.14.6.7",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]

View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.6.6' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.6.7' />
</app>
</gupdate>

View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
"version": "1.14.6.6",
"version": "1.14.6.7",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]

View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.6.6' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.6.7' />
</app>
</gupdate>

1
crx-chromium-version.txt Normal file
View File

@ -0,0 +1 @@
Chromium 73.0.3683.75 built on Debian buster/sid, running on Debian buster/sid

8
tools/sign.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
channel=$1
mkdir -p tmp-crx
cp -r "testbuilds/crx$channel" "tmp-crx/crx$channel"
touch -d "$(jq -r '.date' version.json)" "tmp-crx/crx$channel"/*
chromium --pack-extension="tmp-crx/crx$channel" --pack-extension-key="$(dirname "$PWD")/4chan-x.keys/4chan-X.pem"
mv "tmp-crx/crx$channel.crx" "testbuilds/4chan-X$channel.crx"
rm -r 'tmp-crx/'

View File

@ -1,4 +1,4 @@
{
"version": "1.14.6.6",
"date": "2019-04-05T04:21:37.757Z"
"version": "1.14.6.7",
"date": "2019-04-05T10:16:02.069Z"
}