From 666169f54a7b23669ea2ead147b8cfa42917a720 Mon Sep 17 00:00:00 2001
From: sualko <klaus@jsxc.org>
Date: Tue, 28 Apr 2020 01:17:21 +0200
Subject: [PATCH] chore: fix build scripts

---
 scripts/build-release.js   |  2 +-
 scripts/publish-release.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/build-release.js b/scripts/build-release.js
index 91ca1cb..5cb8c47 100644
--- a/scripts/build-release.js
+++ b/scripts/build-release.js
@@ -66,7 +66,7 @@ async function createRelease(appId) {
     await execa('yarn', ['build']);
     console.log(`✔ scripts built`.green);
 
-    let filePath = await createArchive(appId, appId + '-' + version);
+    let filePath = await createArchive(appId, appId + '-v' + version);
     await createNextcloudSignature(appId, filePath);
     await createGPGSignature(filePath);
     await createGPGArmorSignature(filePath);
diff --git a/scripts/publish-release.js b/scripts/publish-release.js
index 719f6a4..387df68 100644
--- a/scripts/publish-release.js
+++ b/scripts/publish-release.js
@@ -16,10 +16,10 @@ require('dotenv').config();
 const commitMessage = `build: ${package.version}`;
 const tagName = `v${package.version}`;
 const files = [
-    path.join(__dirname, 'archives', `bbb-v${package.version}.tar.gz`),
-    path.join(__dirname, 'archives', `bbb-v${package.version}.tar.gz.asc`),
-    path.join(__dirname, 'archives', `bbb-v${package.version}.tar.gz.ncsig`),
-    path.join(__dirname, 'archives', `bbb-v${package.version}.tar.gz.sig`),
+    path.join(__dirname, '..', 'archives', `bbb-v${package.version}.tar.gz`),
+    path.join(__dirname, '..', 'archives', `bbb-v${package.version}.tar.gz.asc`),
+    path.join(__dirname, '..', 'archives', `bbb-v${package.version}.tar.gz.ncsig`),
+    path.join(__dirname, '..', 'archives', `bbb-v${package.version}.tar.gz.sig`),
 ];
 
 async function notAlreadyTagged() {
@@ -36,7 +36,7 @@ async function isMasterBranch() {
 
 function hasChangeLogEntry() {
     return new Promise(resolve => {
-        fs.readFile(path.join(__dirname, 'CHANGELOG.md'), function (err, data) {
+        fs.readFile(path.join(__dirname, '..', 'CHANGELOG.md'), function (err, data) {
             if (err) throw err;
 
             resolve(data.includes(`[${package.version}]`));
@@ -74,7 +74,7 @@ async function keypress() {
 }
 
 function commit() {
-    return git.commit(commitMessage, ['-S']);
+    return git.commit(commitMessage, ['-S', '-n']);
 }
 
 function push() {