AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into refactoring/android

Browse source
This commit is contained in:
albexk 2023-12-20 20:47:19 +03:00
commit c8d2399db9
69 changed files with 5605 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deploy/build_macos.sh
View file

@ -146,7 +146,7 @@ if [ "${MAC_CERT_PW+x}" ]; then
fi
echo "Building DMG installer..."
hdiutil create -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME
hdiutil create -size 120mb -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME
if [ "${MAC_CERT_PW+x}" ]; then
echo "Signing DMG installer..."

4
deploy/installer/config/controlscript.js
View file

@ -76,9 +76,7 @@ function raiseInstallerWindow()
function appProcessIsRunning()
{
if (runningOnWindows()) {
var cmdArgs = ["/FI", "WINDOWTITLE eq " + appName()];
var result = installer.execute("tasklist", cmdArgs);
var result = installer.execute("tasklist");
if ( Number(result[1]) === 0 ) {
if (result[0].indexOf(appExecutableFileName()) !== -1) {
return true;