Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix: showing licenses in nsis installer

Ilian Sapundshiev5fe4e476c317
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 28410eec4..30209e12c 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tagspaces",
- "version": "6.11.1",
+ "version": "6.11.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "6.11.1",
+ "version": "6.11.2",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
diff --git a/resources/builder.json b/resources/builder.json
index ca4bc6900..6b94a3b38 100644
--- a/resources/builder.json
+++ b/resources/builder.json
@@ -75,7 +75,7 @@
"sign": false
},
"pkg": {
- "license": "assets/license_en.rtf"
+ "license": "assets/license_en.txt"
},
"linux": {
"target": [
diff --git a/scripts/build-licenses.js b/scripts/build-licenses.js
index b1d396c2d..81c3cc2f8 100644
--- a/scripts/build-licenses.js
+++ b/scripts/build-licenses.js
@@ -23,7 +23,8 @@ function escapeRtf(text) {
if (ch === '\\') out += '\\\\';
else if (ch === '{') out += '\\{';
else if (ch === '}') out += '\\}';
- else if (ch === '\n') out += '\\par\n';
+ else if (ch === '\n') out += '\\par ';
+ else if (ch === '\t') out += '\\tab ';
else if (ch === '\r') continue;
else if (code > 127) {
const signed = code > 0x7fff ? code - 0x10000 : code;
@@ -37,11 +38,11 @@ function txtToRtf(text) {
if (text.charCodeAt(0) === 0xfeff) text = text.slice(1);
text = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
return (
- '{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat' +
+ '{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat\\deflang1033' +
'{\\fonttbl{\\f0\\fnil\\fcharset0 Segoe UI;}}\n' +
- '\\fs18\n' +
+ '\\viewkind4\\uc1\\pard\\f0\\fs20 ' +
escapeRtf(text) +
- '\n}'
+ '\\par}\n'
);
}