linux data folder updated

deploy/data/linux/AmneziaVPN_build.desktop

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

@@ -3,6 +3,6 @@
 Type=Application
 Name=AmneziaVPN client
 Comment=AmneziaVPN client
-Exec=bash -c 'export LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib/ ; AmneziaVPN'
+Exec=AmneziaVPN
 Icon=AmneziaVPN_Logo.png
 Categories=VPN

deploy/data/linux/client/AmneziaVPN.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# This is default bat run script of The CQtDeployer project.
+# This file contains key word that will replaced after deploy project.
+#
+# ####################################################################
+#
+# 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.
+# BIN_PATH - are releative path to targets of a deployed distribution.
+
+# SYSTEM_LIB_PATH - are releative path to system libraryes of a deployed distribution.
+# BASE_NAME - are base name of the executable that will be launched after run this script.
+# CUSTOM_SCRIPT_BLOCK - This is code from the customScript option
+# RUN_COMMAND - This is command for run application. Requred BASE_DIR variable.
+#
+# ####################################################################
+
+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
+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 QT_QPA_PLATFORM_PLUGIN_PATH="$BASE_DIR"/plugins//platforms:$QT_QPA_PLATFORM_PLUGIN_PATH
+
+
+
+"$BASE_DIR/bin/AmneziaVPN" "$@" 

deploy/data/linux/client/bin/openssl-easyrsa.cnf

@@ -0,0 +1,138 @@
+# For use with Easy-RSA 3.0+ and OpenSSL or LibreSSL
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= $ENV::EASYRSA_PKI	# Where everything is kept
+certs		= $dir			# Where the issued certs are kept
+crl_dir		= $dir			# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+new_certs_dir	= $dir/certs_by_serial	# default place for new certs.
+
+certificate	= $dir/ca.crt	 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= $dir/private/ca.key	# The private key
+RANDFILE	= $dir/.rand		# private random number file
+
+x509_extensions	= basic_exts		# The extensions to add to the cert
+
+# This allows a V2 CRL. Ancient browsers don't like it, but anything Easy-RSA
+# is designed for will. In return, we get the Issuer attached to CRLs.
+crl_extensions	= crl_ext
+
+default_days	= $ENV::EASYRSA_CERT_EXPIRE	# how long to certify for
+default_crl_days= $ENV::EASYRSA_CRL_DAYS	# how long before next CRL
+default_md	= $ENV::EASYRSA_DIGEST		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# This allows to renew certificates which have not been revoked
+unique_subject	= no
+
+# A few different ways of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_anything
+
+# For the 'anything' policy, which defines allowed DN fields
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+name			= optional
+emailAddress		= optional
+
+####################################################################
+# Easy-RSA request handling
+# We key off $DN_MODE to determine how to format the DN
+[ req ]
+default_bits		= $ENV::EASYRSA_KEY_SIZE
+default_keyfile 	= privkey.pem
+default_md		= $ENV::EASYRSA_DIGEST
+distinguished_name	= $ENV::EASYRSA_DN
+x509_extensions		= easyrsa_ca	# The extensions to add to the self signed cert
+
+# A placeholder to handle the $EXTRA_EXTS feature:
+#%EXTRA_EXTS%	# Do NOT remove or change this line as $EXTRA_EXTS support requires it
+
+####################################################################
+# Easy-RSA DN (Subject) handling
+
+# Easy-RSA DN for cn_only support:
+[ cn_only ]
+commonName		= Common Name (eg: your user, host, or server name)
+commonName_max		= 64
+commonName_default	= $ENV::EASYRSA_REQ_CN
+
+# Easy-RSA DN for org support:
+[ org ]
+countryName			= Country Name (2 letter code)
+countryName_default		= $ENV::EASYRSA_REQ_COUNTRY
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_default	= $ENV::EASYRSA_REQ_PROVINCE
+
+localityName			= Locality Name (eg, city)
+localityName_default		= $ENV::EASYRSA_REQ_CITY
+
+0.organizationName		= Organization Name (eg, company)
+0.organizationName_default	= $ENV::EASYRSA_REQ_ORG
+
+organizationalUnitName		= Organizational Unit Name (eg, section)
+organizationalUnitName_default	= $ENV::EASYRSA_REQ_OU
+
+commonName			= Common Name (eg: your user, host, or server name)
+commonName_max			= 64
+commonName_default		= $ENV::EASYRSA_REQ_CN
+
+emailAddress			= Email Address
+emailAddress_default		= $ENV::EASYRSA_REQ_EMAIL
+emailAddress_max		= 64
+
+####################################################################
+# Easy-RSA cert extension handling
+
+# This section is effectively unused as the main script sets extensions
+# dynamically. This core section is left to support the odd usecase where
+# a user calls openssl directly.
+[ basic_exts ]
+basicConstraints	= CA:FALSE
+subjectKeyIdentifier	= hash
+authorityKeyIdentifier	= keyid,issuer:always
+
+# The Easy-RSA CA extensions
+[ easyrsa_ca ]
+
+# PKIX recommendations:
+
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer:always
+
+# This could be marked critical, but it's nice to support reading by any
+# broken clients who attempt to do so.
+basicConstraints = CA:true
+
+# Limit key usage to CA tasks. If you really want to use the generated pair as
+# a self-signed cert, comment this out.
+keyUsage = cRLSign, keyCertSign
+
+# nsCertType omitted by default. Let's try to let the deprecated stuff die.
+# nsCertType = sslCA
+
+# CRL extensions.
+[ crl_ext ]
+
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always,issuer:always
+

deploy/data/linux/client/bin/qt.conf

@@ -1,7 +1,7 @@
-# Generated by linuxdeployqt
-# https://github.com/probonopd/linuxdeployqt/
 [Paths]
-Prefix = ../
-Plugins = plugins
-Imports = qml
-Qml2Imports = qml
+Prefix= ./../
+Libraries= ./lib/
+Plugins= ./plugins/
+Imports= ./qml/
+Translations= ./translations/
+Qml2Imports= ./qml/

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

@@ -3,6 +3,6 @@
 Type=Application
 Name=AmneziaVPN client
 Comment=AmneziaVPN client
-Exec=AmneziaVPN
+Exec=/home/dev/github/amnezia/AppDir/build_release_v2/client/bin/AmneziaVPN
 Icon=AmneziaVPN_Logo.png
 Categories=VPN

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

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

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

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

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

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

deploy/data/linux/post_install.sh

@@ -29,11 +29,9 @@ sudo chmod +x $APP_PATH/client/bin/easyrsa >> $LOG_FILE
 
 sudo cp $APP_PATH/service/$APP_NAME.service /etc/systemd/system/ >> $LOG_FILE
 
-sudo ln -s $APP_PATH/client/lib/* /usr/lib/ >> $LOG_FILE
-
 sudo systemctl start $APP_NAME >> $LOG_FILE
 sudo systemctl enable $APP_NAME >> $LOG_FILE
-sudo ln -s $APP_PATH/client/bin/$APP_NAME /usr/sbin/ >> $LOG_FILE
+sudo ln -s $APP_PATH/client/$APP_NAME.sh /usr/sbin/$APP_NAME >> $LOG_FILE
 
 
 echo "user desktop creation loop started" >> $LOG_FILE

deploy/data/linux/post_uninstall.sh

@@ -41,6 +41,10 @@ if test -f /usr/sbin/$APP_NAME; then
         sudo rm -rf /usr/sbin/$APP_NAME >> $LOG_FILE
 fi
 
+if test -f /usr/sbin/$APP_NAME-service; then
+        sudo rm -rf /usr/sbin/$APP_NAME-service >> $LOG_FILE
+fi
+
 getent passwd {1000..6000} | while IFS=: read -r name password uid gid gecos home shell; do
 	if test -f /home/$name/Desktop/$APP_NAME\ client.desktop; then
 		sudo rm -rf /home/$name/Desktop/$APP_NAME\ client.desktop >> $LOG_FILE

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

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# This is default bat run script of The CQtDeployer project.
+# This file contains key word that will replaced after deploy project.
+#
+# ####################################################################
+#
+# 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.
+# BIN_PATH - are releative path to targets of a deployed distribution.
+
+# SYSTEM_LIB_PATH - are releative path to system libraryes of a deployed distribution.
+# BASE_NAME - are base name of the executable that will be launched after run this script.
+# CUSTOM_SCRIPT_BLOCK - This is code from the customScript option
+# RUN_COMMAND - This is command for run application. Requred BASE_DIR variable.
+#
+# ####################################################################
+
+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
+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 QT_QPA_PLATFORM_PLUGIN_PATH="$BASE_DIR"/plugins//platforms:$QT_QPA_PLATFORM_PLUGIN_PATH
+
+
+
+"$BASE_DIR/bin/AmneziaVPN-service" "$@" 

deploy/data/linux/service/AmneziaVPN.service

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

deploy/data/linux/service/bin/qt.conf

@@ -0,0 +1,7 @@
+[Paths]
+Prefix= ./../
+Libraries= ./lib/
+Plugins= ./plugins/
+Imports= ./qml/
+Translations= ./translations/
+Qml2Imports= ./qml/