hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-05 17:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #930: make in-browser versions match ex-browser

Browse source 
Additionally, change the 'default' build to be a beta build
in the manifest, and give stable releases prettier version
numbers.
This commit is contained in:
Oliver Blanthorn 2019-05-27 12:59:25 +01:00
parent ed8eaf733f
commit 26343e5a5d
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/git_version.sh
View file

@ -1,8 +1,11 @@
#!/usr/bin/env sh #!/usr/bin/env sh
gitversion=$(git describe --tags | cut -d"-" -f2-) gitversion=pre$(git rev-list --count HEAD)-$(git rev-parse --short HEAD)
if grep -Fq 'tridactyl.vim@cmcaine' ./src/manifest.json ; then
gitversion=""
fi
manversion=$(grep '"version":' ./src/manifest.json | cut -d":" -f2 | tr -d \" | tr -d , | cut -d" " -f2) manversion=$(grep '"version":' ./src/manifest.json | cut -d":" -f2 | tr -d \" | tr -d , | cut -d" " -f2)
version=$manversion-$gitversion version=$manversion$gitversion
sed -i.bak 's/REPLACE_ME_WITH_THE_VERSION_USING_SED/'"$version"'/' ./build/background.js sed -i.bak 's/REPLACE_ME_WITH_THE_VERSION_USING_SED/'"$version"'/' ./build/background.js
sed -i.bak 's/REPLACE_ME_WITH_THE_VERSION_USING_SED/'"$version"'/' ./build/content.js sed -i.bak 's/REPLACE_ME_WITH_THE_VERSION_USING_SED/'"$version"'/' ./build/content.js

4
scripts/sign
View file

@ -11,7 +11,7 @@ publish_beta_nonewtab() {
npm run clean npm run clean
npm run build npm run build
scripts/version.js beta scripts/version.js beta
sed 's/tridactyl.vim@cmcaine/tridactyl.vim.betas.nonewtab@cmcaine/' -i build/manifest.json sed 's/tridactyl.vim.betas@cmcaine/tridactyl.vim.betas.nonewtab@cmcaine/' -i build/manifest.json
sed '/\s*"newtab":.*/d' -i build/manifest.json sed '/\s*"newtab":.*/d' -i build/manifest.json
sed 's/"name": "Tridactyl"/"name": "Tridactyl: No New Tab"/' -i build/manifest.json sed 's/"name": "Tridactyl"/"name": "Tridactyl: No New Tab"/' -i build/manifest.json
sign_and_submit -a web-ext-artifacts/nonewtab sign_and_submit -a web-ext-artifacts/nonewtab
@ -21,7 +21,6 @@ publish_beta() {
npm run clean npm run clean
npm run build npm run build
scripts/version.js beta scripts/version.js beta
sed 's/tridactyl.vim@cmcaine/tridactyl.vim.betas@cmcaine/' -i build/manifest.json
sed 's/"name": "Tridactyl"/"name": "Tridactyl: Beta"/' -i build/manifest.json sed 's/"name": "Tridactyl"/"name": "Tridactyl: Beta"/' -i build/manifest.json
sign_and_submit sign_and_submit
} }
@ -29,6 +28,7 @@ publish_beta() {
publish_stable() { publish_stable() {
npm run clean npm run clean
npm run build npm run build
sed 's/tridactyl.vim.betas@cmcaine/tridactyl.vim@cmcaine/' -i build/manifest.json
sign_and_submit sign_and_submit
tar --exclude-from=.gitignore -czf ../public_html/betas/tridactyl_source.tar.gz . tar --exclude-from=.gitignore -czf ../public_html/betas/tridactyl_source.tar.gz .
} }

2
src/manifest.json
View file

@ -63,7 +63,7 @@
], ],
"applications": { "applications": {
"gecko": { "gecko": {
"id": "tridactyl.vim@cmcaine.co.uk", "id": "tridactyl.vim.betas@cmcaine.co.uk",
"strict_min_version": "66.0" "strict_min_version": "66.0"
} }
}, },