Skip to content

Commit b495914

Browse files
author
Erika Perugachi
authored
Merge pull request #1232 from Hirobreak/appimage
Criptext Encryption Service in AppImage
2 parents 8f6daf4 + e30c62d commit b495914

File tree

9 files changed

+54
-16
lines changed

9 files changed

+54
-16
lines changed

electron_app/package.json

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "criptext",
3-
"version": "0.26.0",
3+
"version": "0.26.2",
44
"author": {
55
"name": "Criptext Inc",
66
"email": "[email protected]",
@@ -35,13 +35,6 @@
3535
"appId": "com.criptext.criptextmail",
3636
"afterSign": "notarize.js",
3737
"buildVersion": "1",
38-
"extraResources": [{
39-
"from": "../signal_interface/build/Release/",
40-
"to": "extraResources",
41-
"filter": [
42-
"**/*"
43-
]
44-
}],
4538
"mac": {
4639
"hardenedRuntime": true,
4740
"gatekeeperAssess": false,
@@ -58,7 +51,16 @@
5851
"publish": [{
5952
"provider": "generic",
6053
"url": "https://cdn.criptext.com/Criptext-Email-Desktop/mac"
61-
}]
54+
}],
55+
"extraResources": [
56+
{
57+
"from": "../signal_interface/build/Release/",
58+
"to": "extraResources",
59+
"filter": [
60+
"**/*"
61+
]
62+
}
63+
]
6264
},
6365
"mas": {
6466
"category": "public.app-category.productivity",
@@ -102,7 +104,16 @@
102104
"publish": [{
103105
"provider": "generic",
104106
"url": "https://cdn.criptext.com/Criptext-Email-Desktop/linux"
105-
}]
107+
}],
108+
"extraResources": [
109+
{
110+
"from": "../signal_interface/build/Image/",
111+
"to": "extraResources",
112+
"filter": [
113+
"**/*"
114+
]
115+
}
116+
]
106117
},
107118
"win": {
108119
"target": [
@@ -114,7 +125,16 @@
114125
"provider": "generic",
115126
"url": "https://cdn.criptext.com/Criptext-Email-Desktop/windows"
116127
}],
117-
"certificateSubjectName": "Criptext Inc"
128+
"certificateSubjectName": "Criptext Inc",
129+
"extraResources": [
130+
{
131+
"from": "../signal_interface/build/Release/",
132+
"to": "extraResources",
133+
"filter": [
134+
"**/*"
135+
]
136+
}
137+
]
118138
},
119139
"nsis": {
120140
"oneClick": true,

email_composer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_composer",
3-
"version": "0.26.0",
3+
"version": "0.26.2",
44
"private": true,
55
"dependencies": {
66
"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_loading/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_loading",
3-
"version": "0.26.0",
3+
"version": "0.26.2",
44
"private": true,
55
"dependencies": {
66
"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_login/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_login",
3-
"version": "0.26.0",
3+
"version": "0.26.2",
44
"private": true,
55
"dependencies": {
66
"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_mailbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_mailbox",
3-
"version": "0.26.0",
3+
"version": "0.26.2",
44
"private": true,
55
"dependencies": {
66
"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

signal_interface/build.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
node-gyp configure build
2+
3+
cp ./installation/criptext-encryption-service.desktop ./build/Release
4+
cp ./installation/icon.png ./build/Release
5+
cd build
6+
mv ./Release/criptext-encryption-service ./Release/AppRun
7+
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
8+
chmod +x appimagetool-x86_64.AppImage
9+
10+
./appimagetool-x86_64.AppImage ./Release
11+
mkdir Image
12+
mv ./criptext-encryption-service-x86_64.AppImage ./Image/criptext-encryption-service
13+
mv ./Release/AppRun ./Release/criptext-encryption-service
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Desktop Entry]
2+
Type=Application
3+
Name=criptext-encryption-service
4+
Icon=icon
5+
Categories=System;
20.1 KB
Loading

signal_interface/installation/linux/linux_binding.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"/usr/lib/x86_64-linux-gnu/libssl.a",
4242
"/usr/lib/x86_64-linux-gnu/libcrypto.a",
4343
"/usr/lib/x86_64-linux-gnu/libsqlite3.a",
44-
"/usr/local/lib/libsignal-protocol-c.a",
44+
"/home/criptext/Pedro/git/civetweb/libcivetweb.a",
4545
"/usr/lib/libcivetweb.so",
4646
"/usr/local/lib/libcjson.a",
4747
"/usr/local/lib/libspdlog.a"

0 commit comments

Comments
 (0)