rms/DefaultVPN
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/DefaultVPN.git synced 2026-05-17 08:36:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Product rename (#4)

Browse Source 
* feat: update app identifiers and development team for iOS and macOS builds

* feat: rename AmneziaVPN to DefaultVPN in iOS configuration and code references

* Complete rename

* Missed folder renamed

* Translation removed from commit

* Another step of renaming

* submodule reverted
This commit is contained in:
Yaroslav
2025-03-25 16:12:13 +01:00
committed by GitHub
parent ab9248032c
commit e12e9a6587
135 changed files with 587 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deploy/build_android.sh
View File

@@ -9,7 +9,7 @@ usage() {
Usage:
build_android [options] <artifact_types>
Build AmneziaVPN android client.
Build DefaultVPN android client.
Artifact types:
-u, --aab Build Android App Bundle (AAB)
@@ -138,7 +138,7 @@ fi
export ANDROIDDEPLOYQT_RUN=1
$QT_HOST_PATH/bin/androiddeployqt \
--input $OUT_APP_DIR/android-AmneziaVPN-deployment-settings.json \
--input $OUT_APP_DIR/android-DefaultVPN-deployment-settings.json \
--output $OUT_APP_DIR/android-build \
"${deployqt_opts[@]}"
@@ -164,7 +164,7 @@ $OUT_APP_DIR/android-build/gradlew \
if [[ -v CI || -v MOVE_RESULT ]]; then
echo "Moving APK/AAB..."
if [ -v AAB ]; then
mv -u $OUT_APP_DIR/android-build/build/outputs/bundle/$BUILD_TYPE/AmneziaVPN-$BUILD_TYPE.aab \
mv -u $OUT_APP_DIR/android-build/build/outputs/bundle/$BUILD_TYPE/DefaultVPN-$BUILD_TYPE.aab \
$PROJECT_DIR/deploy/build/
fi
@@ -181,7 +181,7 @@ if [[ -v CI || -v MOVE_RESULT ]]; then
IFS=';' read -r -a abi_array <<< "$ABIS"
for ABI in "${abi_array[@]}"
do
mv -u $OUT_APP_DIR/android-build/build/outputs/apk/$BUILD_TYPE/AmneziaVPN-$ABI-$suffix.apk \
mv -u $OUT_APP_DIR/android-build/build/outputs/apk/$BUILD_TYPE/DefaultVPN-$ABI-$suffix.apk \
$PROJECT_DIR/deploy/build/
done
fi

8
deploy/build_ios.sh
View File

@@ -12,9 +12,9 @@ mkdir -p $BUILD_DIR
echo "Project dir: ${PROJECT_DIR}"
echo "Build dir: ${BUILD_DIR}"
APP_NAME=AmneziaVPN
APP_NAME=DefaultVPN
APP_FILENAME=$APP_NAME.app
APP_DOMAIN=org.amneziavpn.package
APP_DOMAIN=org.defaultvpn.package
PLIST_NAME=$APP_NAME.plist
@@ -91,9 +91,9 @@ fi
xcodebuild \
"OTHER_CODE_SIGN_FLAGS=--keychain '$KEYCHAIN_FILE'" \
-configuration Release \
-scheme AmneziaVPN \
-scheme DefaultVPN \
-destination "generic/platform=iOS,name=Any iOS'" \
-project $BUILD_DIR/AmneziaVPN.xcodeproj
-project $BUILD_DIR/DefaultVPN.xcodeproj
# restore keychain
security default-keychain -s login.keychain

10
deploy/build_linux.sh
View File

@@ -23,9 +23,9 @@ mkdir -p $CQTDEPLOYER_DIR
echo "Project dir: ${PROJECT_DIR}"
echo "Build dir: ${BUILD_DIR}"
APP_NAME=AmneziaVPN
APP_NAME=DefaultVPN
APP_FILENAME=$APP_NAME.app
APP_DOMAIN=org.amneziavpn.package
APP_DOMAIN=org.defaultvpn.package
DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/linux
PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/client/3rd-prebuilt/deploy-prebuilt/linux/client/bin
@@ -72,8 +72,8 @@ if [ ! -f $CQTDEPLOYER_DIR/cqtdeployer.sh ]; then
fi
$CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/client/AmneziaVPN -qmake $QT_BIN_DIR/qmake -qmlDir $PROJECT_DIR/client/ui/qml/ -targetDir $APP_DIR/client/
$CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/service/server/AmneziaVPN-service -qmake $QT_BIN_DIR/qmake -targetDir $APP_DIR/service/
$CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/client/DefaultVPN -qmake $QT_BIN_DIR/qmake -qmlDir $PROJECT_DIR/client/ui/qml/ -targetDir $APP_DIR/client/
$CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/service/server/DefaultVPN-service -qmake $QT_BIN_DIR/qmake -targetDir $APP_DIR/service/
rm -f $INSTALLER_DATA_DIR/data.7z
@@ -83,4 +83,4 @@ ldd $CQTDEPLOYER_DIR/bin/binarycreator
cp -r $PROJECT_DIR/deploy/installer $BUILD_DIR
$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer.bin
$CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages -f $PROJECT_DIR/deploy/DefaultVPN_Linux_Installer.bin

6
deploy/build_macos.sh
View File

@@ -20,9 +20,9 @@ BUILD_DIR=$DEPLOY_DIR/build
echo "Project dir: ${PROJECT_DIR}"
echo "Build dir: ${BUILD_DIR}"
APP_NAME=AmneziaVPN
APP_NAME=DefaultVPN
APP_FILENAME=$APP_NAME.app
APP_DOMAIN=org.amneziavpn.package
APP_DOMAIN=org.defaultvpn.package
PLIST_NAME=$APP_NAME.plist
OUT_APP_DIR=$BUILD_DIR/client
@@ -147,7 +147,7 @@ fi
echo "Building DMG installer..."
# Allow Terminal to make changes in Privacy & Security > App Management
hdiutil create -size 256mb -volname AmneziaVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME
hdiutil create -size 256mb -volname DefaultVPN -srcfolder $BUILD_DIR/installer/$APP_NAME.app -ov -format UDZO $DMG_FILENAME
if [ "${MAC_CERT_PW+x}" ]; then
echo "Signing DMG installer..."

4
deploy/build_windows.bat
View File

@@ -14,9 +14,9 @@ set PROJECT_DIR=%cd%
set SCRIPT_DIR=%PROJECT_DIR:"=%\deploy
set WORK_DIR=%SCRIPT_DIR:"=%\build_%BUILD_ARCH:"=%
set APP_NAME=AmneziaVPN
set APP_NAME=DefaultVPN
set APP_FILENAME=%APP_NAME:"=%.exe
set APP_DOMAIN=org.amneziavpn.package
set APP_DOMAIN=org.defaultvpn.package
set OUT_APP_DIR=%WORK_DIR:"=%\client\release
set PREBILT_DEPLOY_DATA_DIR=%PROJECT_DIR:"=%\client\3rd-prebuilt\deploy-prebuilt\windows\x%BUILD_ARCH:"=%
set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=%

14
deploy/data/linux/AmneziaVPN.service
View File

@@ -1,14 +0,0 @@
[Unit]
Description=AmneziaVPN Service
After=network.target
StartLimitIntervalSec=0
[Service]
Type=simple
Restart=always
RestartSec=1
ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh
Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib
[Install]
WantedBy=multi-user.target

0
deploy/data/linux/AmneziaVPN.png → deploy/data/linux/DefaultVPN.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

14
deploy/data/linux/DefaultVPN.service Executable file
View File

@@ -0,0 +1,14 @@
[Unit]
Description=DefaultVPN Service
After=network.target
StartLimitIntervalSec=0
[Service]
Type=simple
Restart=always
RestartSec=1
ExecStart=/opt/DefaultVPN/service/DefaultVPN-service.sh
Environment=LD_LIBRARY_PATH=/opt/DefaultVPN/client/lib
[Install]
WantedBy=multi-user.target

4
deploy/data/linux/client/AmneziaVPN.sh → deploy/data/linux/client/DefaultVPN.sh
View File

@@ -25,10 +25,10 @@ export QT_PLUGIN_PATH="$BASE_DIR"/plugins/:$QT_PLUGIN_PATH
export QTWEBENGINEPROCESS_PATH="$BASE_DIR"/bin//QtWebEngineProcess
export QTDIR="$BASE_DIR"
export CQT_PKG_ROOT="$BASE_DIR"
export CQT_RUN_FILE="$BASE_DIR/AmneziaVPN.sh"
export CQT_RUN_FILE="$BASE_DIR/DefaultVPN.sh"
export QT_QPA_PLATFORM_PLUGIN_PATH="$BASE_DIR"/plugins//platforms:$QT_QPA_PLATFORM_PLUGIN_PATH
"$BASE_DIR/bin/AmneziaVPN" "$@"
"$BASE_DIR/bin/DefaultVPN" "$@"

6
deploy/data/linux/post_install.sh
View File

@@ -1,18 +1,18 @@
#!/bin/bash
APP_NAME=AmneziaVPN
APP_NAME=DefaultVPN
LOG_FOLDER=/var/log/$APP_NAME
LOG_FILE="$LOG_FOLDER/post-install.log"
APP_PATH=/opt/$APP_NAME
if ! test -f $LOG_FOLDER; then
sudo mkdir $LOG_FOLDER
echo "AmneziaVPN log dir created at /var/log/"
echo "DefaultVPN log dir created at /var/log/"
fi
if ! test -f $LOG_FILE; then
touch $LOG_FILE
echo "AmneziaVPN log file created at /var/log/AmneziaVPN/post-install.log"
echo "DefaultVPN log file created at /var/log/DefaultVPN/post-install.log"
fi
date > $LOG_FILE

4
deploy/data/linux/post_uninstall.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
APP_NAME=AmneziaVPN
APP_NAME=DefaultVPN
LOG_FOLDER=/var/log/$APP_NAME
LOG_FILE="$LOG_FOLDER/post-uninstall.log"
APP_PATH=/opt/$APP_NAME
@@ -18,7 +18,7 @@ if command -v steamos-readonly &> /dev/null; then
echo "steamos-readonly disabled" >> $LOG_FILE
fi
ls /opt/AmneziaVPN/client/lib/* | while IFS=: read -r dir; do
ls /opt/DefaultVPN/client/lib/* | while IFS=: read -r dir; do
sudo unlink $dir >> $LOG_FILE
done

4
deploy/data/linux/service/AmneziaVPN-service.sh → deploy/data/linux/service/DefaultVPN-service.sh
View File

@@ -25,10 +25,10 @@ export QT_PLUGIN_PATH="$BASE_DIR"/plugins/:$QT_PLUGIN_PATH
export QTWEBENGINEPROCESS_PATH="$BASE_DIR"/bin//QtWebEngineProcess
export QTDIR="$BASE_DIR"
export CQT_PKG_ROOT="$BASE_DIR"
export CQT_RUN_FILE="$BASE_DIR/AmneziaVPN-service.sh"
export CQT_RUN_FILE="$BASE_DIR/DefaultVPN-service.sh"
export QT_QPA_PLATFORM_PLUGIN_PATH="$BASE_DIR"/plugins//platforms:$QT_QPA_PLATFORM_PLUGIN_PATH
"$BASE_DIR/bin/AmneziaVPN-service" "$@"
"$BASE_DIR/bin/DefaultVPN-service" "$@"

4
deploy/data/macos/AmneziaVPN.plist → deploy/data/macos/DefaultVPN.plist
View File

@@ -3,10 +3,10 @@
<plist version="1.0">
<dict>
<key>Label</key>
<string>AmneziaVPN-service</string>
<string>DefaultVPN-service</string>
<key>ProgramArguments</key>
<array>
<string>/Applications/AmneziaVPN.app/Contents/MacOS/AmneziaVPN-service</string>
<string>/Applications/DefaultVPN.app/Contents/MacOS/DefaultVPN-service</string>
</array>
<key>KeepAlive</key>
<true/>

2
deploy/data/macos/post_install.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
APP_NAME=AmneziaVPN
APP_NAME=DefaultVPN
PLIST_NAME=$APP_NAME.plist
LAUNCH_DAEMONS_PLIST_NAME=/Library/LaunchDaemons/$PLIST_NAME
LOG_FOLDER=/var/log/$APP_NAME

2
deploy/data/macos/post_uninstall.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
APP_NAME=AmneziaVPN
APP_NAME=DefaultVPN
PLIST_NAME=$APP_NAME.plist
LAUNCH_DAEMONS_PLIST_NAME=/Library/LaunchDaemons/$PLIST_NAME

8
deploy/data/windows/x32/post_install.cmd
View File

@@ -1,5 +1,5 @@
sc stop AmneziaWGTunnel$AmneziaVPN
sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
sc stop AmneziaWGTunnel$DefaultVPN
sc delete AmneziaWGTunnel$DefaultVPN
taskkill /IM "DefaultVPN-service.exe" /F
taskkill /IM "DefaultVPN.exe" /F
exit /b 0

14
deploy/data/windows/x32/post_uninstall.cmd
View File

@@ -1,12 +1,12 @@
set AmneziaPath=%~dp0
echo %AmneziaPath%
"%AmneziaPath%\AmneziaVPN.exe" -c
"%AmneziaPath%\DefaultVPN.exe" -c
timeout /t 1
sc stop AmneziaVPN-service
sc delete AmneziaVPN-service
sc stop AmneziaWGTunnel$AmneziaVPN
sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
sc stop DefaultVPN-service
sc delete DefaultVPN-service
sc stop AmneziaWGTunnel$DefaultVPN
sc delete AmneziaWGTunnel$DefaultVPN
taskkill /IM "DefaultVPN-service.exe" /F
taskkill /IM "DefaultVPN.exe" /F
exit /b 0

8
deploy/data/windows/x64/post_install.cmd
View File

@@ -1,5 +1,5 @@
sc stop AmneziaWGTunnel$AmneziaVPN
sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
sc stop AmneziaWGTunnel$DefaultVPN
sc delete AmneziaWGTunnel$DefaultVPN
taskkill /IM "DefaultVPN-service.exe" /F
taskkill /IM "DefaultVPN.exe" /F
exit /b 0

14
deploy/data/windows/x64/post_uninstall.cmd
View File

@@ -1,12 +1,12 @@
set AmneziaPath=%~dp0
echo %AmneziaPath%
"%AmneziaPath%\AmneziaVPN.exe" -c
"%AmneziaPath%\DefaultVPN.exe" -c
timeout /t 1
sc stop AmneziaVPN-service
sc delete AmneziaVPN-service
sc stop AmneziaWGTunnel$AmneziaVPN
sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
sc stop DefaultVPN-service
sc delete DefaultVPN-service
sc stop AmneziaWGTunnel$DefaultVPN
sc delete AmneziaWGTunnel$DefaultVPN
taskkill /IM "DefaultVPN-service.exe" /F
taskkill /IM "DefaultVPN.exe" /F
exit /b 0

8
deploy/installer/config.cmake
View File

@@ -17,12 +17,12 @@ elseif(LINUX)
)
configure_file(
${CMAKE_CURRENT_LIST_DIR}/config/AmneziaVPN.desktop.in
${CMAKE_BINARY_DIR}/../AppDir/AmneziaVPN.desktop
${CMAKE_CURRENT_LIST_DIR}/config/DefaultVPN.desktop.in
${CMAKE_BINARY_DIR}/../AppDir/DefaultVPN.desktop
)
endif()
configure_file(
${CMAKE_CURRENT_LIST_DIR}/packages/org.amneziavpn.package/meta/package.xml.in
${CMAKE_BINARY_DIR}/installer/packages/org.amneziavpn.package/meta/package.xml
${CMAKE_CURRENT_LIST_DIR}/packages/org.defaultvpn.package/meta/package.xml.in
${CMAKE_BINARY_DIR}/installer/packages/org.defaultvpn.package/meta/package.xml
)

6
deploy/installer/config/AmneziaVPN.desktop.in → deploy/installer/config/DefaultVPN.desktop.in
View File

@@ -1,10 +1,10 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Type=Application
Name=AmneziaVPN
Name=DefaultVPN
Version=@CMAKE_PROJECT_VERSION@
Comment=Client of your self-hosted VPN
Exec=AmneziaVPN
Icon=/usr/share/pixmaps/AmneziaVPN.png
Exec=DefaultVPN
Icon=/usr/share/pixmaps/DefaultVPN.png
Categories=Network;Qt;Security;
Terminal=false

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

@@ -21,8 +21,8 @@ function appExecutableFileName()
function appInstalled()
{
if (runningOnWindows()) {
appInstalledUninstallerPath = installer.value("RootDir") + "Program Files/AmneziaVPN/maintenancetool.exe";
appInstalledUninstallerPath_x86 = installer.value("RootDir") + "Program Files (x86)/AmneziaVPN/maintenancetool.exe";
appInstalledUninstallerPath = installer.value("RootDir") + "Program Files/DefaultVPN/maintenancetool.exe";
appInstalledUninstallerPath_x86 = installer.value("RootDir") + "Program Files (x86)/DefaultVPN/maintenancetool.exe";
} else if (runningOnMacOS()){
appInstalledUninstallerPath = "/Applications/" + appName() + ".app/maintenancetool.app/Contents/MacOS/maintenancetool";
} else if (runningOnLinux()){

14
deploy/installer/config/linux.xml.in
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>AmneziaVPN</Name>
<Name>DefaultVPN</Name>
<Version>@CMAKE_PROJECT_VERSION@</Version>
<Title>AmneziaVPN</Title>
<Publisher>AmneziaVPN</Publisher>
<StartMenuDir>AmneziaVPN</StartMenuDir>
<TargetDir>@ApplicationsDir@/AmneziaVPN</TargetDir>
<Title>DefaultVPN</Title>
<Publisher>DefaultVPN</Publisher>
<StartMenuDir>DefaultVPN</StartMenuDir>
<TargetDir>@ApplicationsDir@/DefaultVPN</TargetDir>
<WizardDefaultWidth>600</WizardDefaultWidth>
<WizardDefaultHeight>380</WizardDefaultHeight>
<WizardStyle>Modern</WizardStyle>
@@ -19,9 +19,9 @@
<DisableAuthorizationFallback>true</DisableAuthorizationFallback>
<RemoteRepositories>
<Repository>
<Url>https://amneziavpn.org/updates/linux</Url>
<Url>https://defaultvpn.org/updates/linux</Url>
<Enabled>true</Enabled>
<DisplayName>AmneziaVPN - repository for Linux</DisplayName>
<DisplayName>DefaultVPN - repository for Linux</DisplayName>
</Repository>
</RemoteRepositories>
</Installer>

14
deploy/installer/config/macos.xml.in
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>AmneziaVPN</Name>
<Name>DefaultVPN</Name>
<Version>@CMAKE_PROJECT_VERSION@</Version>
<Title>AmneziaVPN</Title>
<Publisher>AmneziaVPN</Publisher>
<StartMenuDir>AmneziaVPN</StartMenuDir>
<TargetDir>/Applications/AmneziaVPN.app</TargetDir>
<Title>DefaultVPN</Title>
<Publisher>DefaultVPN</Publisher>
<StartMenuDir>DefaultVPN</StartMenuDir>
<TargetDir>/Applications/DefaultVPN.app</TargetDir>
<WizardDefaultWidth>600</WizardDefaultWidth>
<WizardDefaultHeight>380</WizardDefaultHeight>
<WizardStyle>Mac</WizardStyle>
@@ -19,9 +19,9 @@
<DisableAuthorizationFallback>true</DisableAuthorizationFallback>
<RemoteRepositories>
<Repository>
<Url>https://amneziavpn.org/updates/macos</Url>
<Url>https://defaultvpn.org/updates/macos</Url>
<Enabled>true</Enabled>
<DisplayName>AmneziaVPN - repository for macOS</DisplayName>
<DisplayName>DefaultVPN - repository for macOS</DisplayName>
</Repository>
</RemoteRepositories>
</Installer>

10
deploy/installer/config/windows.xml.in
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>AmneziaVPN</Name>
<Name>DefaultVPN</Name>
<Version>@CMAKE_PROJECT_VERSION@</Version>
<Title>AmneziaVPN</Title>
<Publisher>AmneziaVPN</Publisher>
<StartMenuDir>AmneziaVPN</StartMenuDir>
<TargetDir>@RootDir@/Program Files/AmneziaVPN</TargetDir>
<Title>DefaultVPN</Title>
<Publisher>DefaultVPN</Publisher>
<StartMenuDir>DefaultVPN</StartMenuDir>
<TargetDir>@RootDir@/Program Files/DefaultVPN</TargetDir>
<WizardDefaultWidth>600</WizardDefaultWidth>
<WizardDefaultHeight>380</WizardDefaultHeight>
<WizardStyle>Modern</WizardStyle>

0
deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js → deploy/installer/packages/org.defaultvpn.package/meta/componentscript.js
View File

4
deploy/installer/packages/org.amneziavpn.package/meta/package.xml.in → deploy/installer/packages/org.defaultvpn.package/meta/package.xml.in
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Package>
<DisplayName>AmneziaVPN</DisplayName>
<Description>Installation package for AmneziaVPN</Description>
<DisplayName>DefaultVPN</DisplayName>
<Description>Installation package for DefaultVPN</Description>
<Version>@CMAKE_PROJECT_VERSION@</Version>
<ReleaseDate>@RELEASE_DATE@</ReleaseDate>
<Default>true</Default>