2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2025-02-02 21:23:25 +00:00

Linux/Darwin now has correct artifact name

This commit is contained in:
UKDTOM 2020-10-16 22:44:46 +02:00
parent ae7e0cbca9
commit 822eb329ad
5 changed files with 29 additions and 5 deletions

5
.gitignore vendored
View file

@ -21,4 +21,7 @@ yarn-error.log*
*.sw?
#Electron-builder output
/dist_electron*
/dist_electron*
#WebTools-NG speclials
/public/version

6
package-lock.json generated
View file

@ -11666,6 +11666,12 @@
"aproba": "^1.1.1"
}
},
"run-script-os": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.1.tgz",
"integrity": "sha512-tM3mfchUIpo9WOFioO3eO/lTgRbtqcqBmSkkqfkjXmxn7vvhwykOXxOOKIXFP+ZConvLsS5KskM3yX+XBfDD4g==",
"dev": true
},
"rx-lite": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",

View file

@ -1,15 +1,16 @@
{
"name": "webtools-ng",
"version": "0.1.6",
"description": "WebTools Next Generation 4 Plex",
"author": "dane22 & CPSO",
"license": "MPL-2.0",
"homepage": "https://github.com/WebTools-NG/WebTools-NG",
"private": true,
"scripts": {
"serve": "vue-cli-service electron:serve",
"build": "vue-cli-service electron:build",
"serve": "vue-cli-service electron:serve",
"build": "run-script-os",
"build:darwin:linux": "chmod +x script/getGitVer.sh && script/getGitVer.sh && vue-cli-service electron:build",
"build:win32": "vue-cli-service electron:build",
"lint": "vue-cli-service lint",
"electron:build": "vue-cli-service electron:build",
"electron:serve": "vue-cli-service electron:serve",
@ -58,6 +59,7 @@
"electron": "^7.3.2",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2",
"run-script-os": "^1.1.1",
"vue-cli-plugin-electron-builder": "^1.4.6",
"vue-cli-plugin-i18n": "^1.0.1",
"vue-template-compiler": "^2.6.11"

8
script/getGitVer.sh Executable file
View file

@ -0,0 +1,8 @@
# get commit hash
rev=$(git rev-parse --short HEAD 2>&1)
# Export to env as well, for the artifact
export AppRev=$(git rev-parse --short HEAD 2>&1)
# Get git root directory
root=$(git rev-parse --show-toplevel 2>&1)
# Save to version file
echo "$rev" > "$root/public/version"

View file

@ -10,11 +10,16 @@ module.exports = {
},
electronBuilder: {
builderOptions: {
appId: "com.webtools.webtools-ng",
appId: "com.webtools.webtools-ng",
artifactName: "${productName}-${version}.${env.AppRev}.${ext}",
"extraResources": [
{
"from": "./public/locales",
"to": "locales"
},
{
"from": "./public/version",
"to": "version"
}
],
linux: {