Merge pull request #92 from amnezia-vpn/Linux_deploy_refactored

Linux deploy refactored

deploy/data/linux/AmneziaVPN.desktop

@@ -0,0 +1,10 @@
+#!/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

deploy/data/linux/AmneziaVPN.service

@@ -7,8 +7,7 @@ StartLimitIntervalSec=0
 Type=simple
 Restart=always
 RestartSec=1
-ExecStart=/opt/AmneziaVPN/service/bin/AmneziaVPN-service
-Environment="LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib/"
+ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh
 
 [Install]
 WantedBy=multi-user.target

deploy/data/linux/AmneziaVPN_build.desktop

@@ -1,8 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Name=AmneziaVPN client
-Comment=AmneziaVPN client
-Exec=AmneziaVPN
-Icon=AmneziaVPN_Logo.png
-Categories=VPN

deploy/data/linux/client/AmneziaVPN.desktop

@@ -1,8 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Name=AmneziaVPN client
-Comment=AmneziaVPN client
-Exec=AmneziaVPN
-Icon=AmneziaVPN_Logo.png
-Categories=VPN

deploy/data/linux/client/AmneziaVPN.sh

@@ -5,8 +5,6 @@
 #
 # ####################################################################
 #
-# All variables has the CQT_ prefix
-# BIN_PATH - are releative path to executable files of a deployed distribution.
 # LIB_PATH - are releative path to libraryes of a deployed distribution.
 # QML_PATH - are releative path to qml libraryes of a deployed distribution.
 # PLUGIN_PATH - are releative path to qt plugins of a deployed distribution.
@@ -20,7 +18,6 @@
 # ####################################################################
 
 BASE_DIR=$(dirname "$(readlink -f "$0")")
-export PATH="$BASE_DIR"/bin/:$PATH
 export LD_LIBRARY_PATH="$BASE_DIR"/lib/:"$BASE_DIR":$LD_LIBRARY_PATH
 export QML_IMPORT_PATH="$BASE_DIR"/qml/:$QML_IMPORT_PATH
 export QML2_IMPORT_PATH="$BASE_DIR"/qml/:$QML2_IMPORT_PATH

deploy/data/linux/client/share/applications/AmneziaVPN.desktop

@@ -0,0 +1,10 @@
+#!/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

deploy/data/linux/client/share/applications/AmneziaVPN_build.desktop

@@ -1,8 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Name=AmneziaVPN client
-Comment=AmneziaVPN client
-Exec=AmneziaVPN
-Icon=AmneziaVPN_Logo.png
-Categories=VPN

deploy/data/linux/client/translations/qtbase_en.qm

@@ -1 +0,0 @@
-<ｸdﾊ�箆!ｿ`｡ｽﾝ

deploy/data/linux/client/translations/qtdeclarative_en.qm

@@ -1 +0,0 @@
-<ｸdﾊ�箆!ｿ`｡ｽﾝ

deploy/data/linux/client/translations/qtmultimedia_en.qm

@@ -1 +0,0 @@
-<ｸdﾊ�箆!ｿ`｡ｽﾝ

deploy/data/linux/service/AmneziaVPN-service.sh

@@ -5,8 +5,6 @@
 #
 # ####################################################################
 #
-# All variables has the CQT_ prefix
-# BIN_PATH - are releative path to executable files of a deployed distribution.
 # LIB_PATH - are releative path to libraryes of a deployed distribution.
 # QML_PATH - are releative path to qml libraryes of a deployed distribution.
 # PLUGIN_PATH - are releative path to qt plugins of a deployed distribution.
@@ -20,7 +18,6 @@
 # ####################################################################
 
 BASE_DIR=$(dirname "$(readlink -f "$0")")
-export PATH="$BASE_DIR"/bin/:$PATH
 export LD_LIBRARY_PATH="$BASE_DIR"/lib/:"$BASE_DIR":$LD_LIBRARY_PATH
 export QML_IMPORT_PATH="$BASE_DIR"/qml/:$QML_IMPORT_PATH
 export QML2_IMPORT_PATH="$BASE_DIR"/qml/:$QML2_IMPORT_PATH

deploy/data/linux/service/share/applications/AmneziaVPN_build.desktop

@@ -1,7 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Name=AmneziaVPN service
-Comment=AmneziaVPN service
-Exec=AmneziaVPN-service
-Categories=VPN

deploy/data/linux/service/translations/qtbase_en.qm

@@ -1 +0,0 @@
-<ｸdﾊ�箆!ｿ`｡ｽﾝ