Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:laurent22/joplin

pull/2466/head
Helmut K. C. Tessarek 2020-02-07 20:06:57 -05:00
parent 1abff212f9 cfb59f2f19
commit 639712c003
No known key found for this signature in database
GPG Key ID: BE0985349D44DD00
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectronClient/app/compile-package-info.js
View File

@ -23,6 +23,8 @@ try {
// Use stdio: 'pipe' so that execSync doesn't print error directly to stdout
branch = execSync('git rev-parse --abbrev-ref HEAD', { stdio: 'pipe' }).toString().trim();
hash = execSync('git log --pretty="%h" -1', { stdio: 'pipe' }).toString().trim();
// The builds in CI are done from a 'detached HEAD' state
if (branch === 'HEAD') branch = 'master';
} catch (err) {
// Don't display error object as it's a "fatal" error, but
// not for us, since is it not critical information