diff --git a/CMakeLists.txt b/CMakeLists.txt index 50bd621c..716d6a7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,10 @@ project(${PROJECT} VERSION 4.0.7.1 DESCRIPTION "AmneziaVPN" HOMEPAGE_URL "https://amnezia.org/" ) -set(RELEASE_DATE "2023-09-21") + +string(TIMESTAMP CURRENT_DATE "%Y-%m-%d") +set(RELEASE_DATE "${CURRENT_DATE}") + set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index f31a82ce..f0f71f52 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -324,16 +324,5 @@ if(NOT IOS AND NOT ANDROID) endif() -if(WIN32) - add_custom_command( - TARGET ${PROJECT} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E $,copy,true> - $/../service/wireguard-service/wireguard-service.exe - $/wireguard/wireguard-service.exe - COMMAND_EXPAND_LISTS - ) -endif() - - target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC}) qt_finalize_target(${PROJECT}) diff --git a/client/daemon/daemonlocalserverconnection.cpp b/client/daemon/daemonlocalserverconnection.cpp index 43c67f16..1a49b7e5 100644 --- a/client/daemon/daemonlocalserverconnection.cpp +++ b/client/daemon/daemonlocalserverconnection.cpp @@ -108,7 +108,7 @@ void DaemonLocalServerConnection::parseCommand(const QByteArray& data) { } if (type == "deactivate") { - Daemon::instance()->deactivate(); + Daemon::instance()->deactivate(true); return; } diff --git a/client/mozilla/localsocketcontroller.cpp b/client/mozilla/localsocketcontroller.cpp index c9fa6a42..d454c16e 100644 --- a/client/mozilla/localsocketcontroller.cpp +++ b/client/mozilla/localsocketcontroller.cpp @@ -190,6 +190,7 @@ void LocalSocketController::deactivate() { QJsonObject json; json.insert("type", "deactivate"); write(json); + emit disconnected(); } void LocalSocketController::checkStatus() { diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat index 7ae3e9f6..c4b7b8cf 100644 --- a/deploy/build_windows.bat +++ b/deploy/build_windows.bat @@ -68,7 +68,6 @@ signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.co echo "Copying deploy data..." xcopy %DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f xcopy %PREBILT_DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f -copy "%WORK_DIR:"=%\service\wireguard-service\release\wireguard-service.exe" %OUT_APP_DIR%\wireguard\ cd %SCRIPT_DIR% xcopy %SCRIPT_DIR:"=%\installer %WORK_DIR:"=%\installer /s /e /y /i /f diff --git a/deploy/data/linux/AmneziaVPN.png b/deploy/data/linux/AmneziaVPN.png new file mode 100644 index 00000000..0f104da2 Binary files /dev/null and b/deploy/data/linux/AmneziaVPN.png differ diff --git a/deploy/data/linux/client/share/applications/AmneziaVPN.desktop b/deploy/data/linux/client/share/applications/AmneziaVPN.desktop deleted file mode 100755 index d89252c0..00000000 --- a/deploy/data/linux/client/share/applications/AmneziaVPN.desktop +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Type=Application -Name=AmneziaVPN client -Version=2.0.10 -Comment=Client of your self-hosted VPN -Exec=AmneziaVPN -Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png -Categories=Network;Qt;Security; -Terminal=false diff --git a/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png b/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png deleted file mode 100755 index 0e281afb..00000000 Binary files a/deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png and /dev/null differ diff --git a/deploy/data/linux/post_install.sh b/deploy/data/linux/post_install.sh index f69de3d5..b3345bac 100755 --- a/deploy/data/linux/post_install.sh +++ b/deploy/data/linux/post_install.sh @@ -37,6 +37,7 @@ sudo ln -s $APP_PATH/client/$APP_NAME.sh /usr/local/bin/$APP_NAME >> $LOG_FILE echo "user desktop creation loop started" >> $LOG_FILE sudo cp $APP_PATH/$APP_NAME.desktop /usr/share/applications/ >> $LOG_FILE +sudo cp $APP_PATH/$APP_NAME.png /usr/share/pixmaps/ >> $LOG_FILE sudo chmod 555 /usr/share/applications/$APP_NAME.desktop >> $LOG_FILE echo "user desktop creation loop ended" >> $LOG_FILE diff --git a/deploy/data/linux/post_uninstall.sh b/deploy/data/linux/post_uninstall.sh index 029bb7cf..5849a90e 100755 --- a/deploy/data/linux/post_uninstall.sh +++ b/deploy/data/linux/post_uninstall.sh @@ -54,6 +54,11 @@ if test -f /usr/share/applications/$APP_NAME.desktop; then fi +if test -f /usr/share/pixmaps/$APP_NAME.png; then + sudo rm -f /usr/share/pixmaps/$APP_NAME.png >> $LOG_FILE + +fi + date >> $LOG_FILE echo "Service after uninstall status:" >> $LOG_FILE sudo systemctl status $APP_NAME >> $LOG_FILE diff --git a/deploy/installer/config.cmake b/deploy/installer/config.cmake index 7cc75153..13f09986 100644 --- a/deploy/installer/config.cmake +++ b/deploy/installer/config.cmake @@ -15,6 +15,11 @@ elseif(LINUX) ${CMAKE_CURRENT_LIST_DIR}/config/linux.xml.in ${CMAKE_BINARY_DIR}/installer/config/linux.xml ) + + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/config/AmneziaVPN.desktop.in + ${CMAKE_BINARY_DIR}/../AppDir/AmneziaVPN.desktop + ) endif() configure_file( diff --git a/deploy/data/linux/AmneziaVPN.desktop b/deploy/installer/config/AmneziaVPN.desktop.in similarity index 64% rename from deploy/data/linux/AmneziaVPN.desktop rename to deploy/installer/config/AmneziaVPN.desktop.in index d89252c0..2a53074e 100755 --- a/deploy/data/linux/AmneziaVPN.desktop +++ b/deploy/installer/config/AmneziaVPN.desktop.in @@ -1,10 +1,10 @@ #!/usr/bin/env xdg-open [Desktop Entry] Type=Application -Name=AmneziaVPN client -Version=2.0.10 +Name=AmneziaVPN +Version=@CMAKE_PROJECT_VERSION@ Comment=Client of your self-hosted VPN Exec=AmneziaVPN -Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png +Icon=/usr/share/pixmaps/AmneziaVPN.png Categories=Network;Qt;Security; Terminal=false diff --git a/deploy/installer/config/linux.xml.in b/deploy/installer/config/linux.xml.in index 150c9cc5..a39edbe4 100644 --- a/deploy/installer/config/linux.xml.in +++ b/deploy/installer/config/linux.xml.in @@ -1,7 +1,7 @@ AmneziaVPN - 1.6.0.0 + @CMAKE_PROJECT_VERSION@ AmneziaVPN AmneziaVPN AmneziaVPN