Skip to content

Commit f819b8a

Browse files
authored
Update profile skeleton (EFForg#18067)
Update profile skeleton `extensions.json` file to most recent Firefox standards. Fixes test installation breaking in Firefox 67+.
1 parent 413dc88 commit f819b8a

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

test/firefox.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source utils/mktemp.sh
1717
# We'll create a Firefox profile here and install HTTPS Everywhere into it.
1818
PROFILE_DIRECTORY="$(mktemp -d)"
1919
trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
20-
HTTPSE_INSTALL_DIRECTORY=$PROFILE_DIRECTORY/extensions/https-everywhere-eff@eff.org
20+
HTTPSE_INSTALL_FILE=$PROFILE_DIRECTORY/extensions/https-everywhere-eff@eff.org.xpi
2121

2222
# Build the XPI to run all the validations in make.sh, and to ensure that
2323
# we test what is actually getting built.
@@ -28,14 +28,14 @@ XPI_NAME="`ls -tr pkg/https-everywhere-20*.xpi | tail -1`"
2828
# The skeleton contains a few files required to trick Firefox into thinking
2929
# that the extension was fully installed rather than just unpacked.
3030
cp -a test/firefox/test_profile_skeleton/* $PROFILE_DIRECTORY
31-
unzip -qd $HTTPSE_INSTALL_DIRECTORY $XPI_NAME
31+
cp $XPI_NAME $HTTPSE_INSTALL_FILE
3232

3333
die() {
3434
echo "$@"
3535
exit 1
3636
}
3737

38-
if [ ! -d "$HTTPSE_INSTALL_DIRECTORY" ]; then
38+
if [ ! -f "$HTTPSE_INSTALL_FILE" ]; then
3939
die "Firefox profile does not have HTTPS Everywhere installed"
4040
fi
4141

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
11
{
22
"addons": [
33
{
4-
"aboutURL": "chrome://https-everywhere/content/about.xul",
4+
"aboutURL": null,
55
"active": true,
66
"appDisabled": false,
77
"applyBackgroundUpdates": 1,
8-
"bootstrap": false,
8+
"blocklistState": 0,
9+
"blocklistURL": null,
910
"defaultLocale": {
10-
"creator": "EFF Technologists",
11+
"contributors": null,
12+
"creator": "extension-devs@eff.org",
1113
"description": "Encrypt the Web! Automatically use HTTPS security on many sites.",
14+
"developers": null,
1215
"homepageURL": "https://www.eff.org/https-everywhere",
13-
"name": "HTTPS Everywhere"
16+
"name": "HTTPS Everywhere",
17+
"translators": null
1418
},
15-
"descriptor": "/tmp/tmp.KvR5nzzEal/extensions/https-everywhere-eff@eff.org",
19+
"dependencies": [],
1620
"foreignInstall": false,
17-
"hasBinaryComponents": false,
18-
"icon64URL": null,
19-
"iconURL": "chrome://https-everywhere/skin/https-everywhere.png",
20-
"icons": {},
21+
"hidden": false,
22+
"iconURL": null,
2123
"id": "https-everywhere-eff@eff.org",
22-
"installDate": 1451269062000,
23-
"internalName": null,
24-
"locales": [],
24+
"installDate": 1559865340000,
25+
"installTelemetryInfo": {
26+
"method": "link",
27+
"source": "unknown"
28+
},
29+
"loader": null,
2530
"location": "app-profile",
26-
"multiprocessCompatible": true,
27-
"optionsType": null,
28-
"optionsURL": "chrome://https-everywhere/content/observatory-preferences.xul",
31+
"optionsBrowserStyle": true,
32+
"optionsType": 5,
2933
"releaseNotesURI": null,
30-
"signedState": 1,
31-
"size": 9460335,
34+
"seen": true,
35+
"signedState": 2,
3236
"skinnable": false,
3337
"softDisabled": false,
34-
"strictCompatibility": false,
35-
"syncGUID": "L3vNFuFgQJ4m",
38+
"sourceURI": "https://www.eff.org/files/https-everywhere-latest.xpi",
39+
"startupData": null,
40+
"strictCompatibility": true,
41+
"targetPlatforms": [],
3642
"type": "extension",
37-
"updateDate": 1451269062000,
43+
"updateDate": 1559865340000,
3844
"userDisabled": false,
3945
"visible": true
4046
}
41-
],
42-
"schemaVersion": 17
47+
]
4348
}

0 commit comments

Comments
 (0)