Мелкие правки vipnetclient-gui-4.14.0.23314

net-vpn/vipnetclient-gui/vipnetclient-gui-4.14.0.23314-r3.ebuild

@@ -9,7 +9,6 @@ DESCRIPTION="ViPNet Client for Linux GUI by JSC InfoTeCS"
 HOMEPAGE="https://www.vipnet.ru"
 SRC_URI="https://git.calculate-linux.org/serg-sg/sources/raw/branch/master/net-vpn/vipnetclient/${PN}_ru_amd64_${PV}.deb"
 
-
 LICENSE=""
 SLOT="0"
 KEYWORDS="~amd64"
@@ -17,6 +16,9 @@ RESTRICT="bindist mirror strip"
 
 
 RDEPEND="
+	!net-vpn/vipnetclient-gui
+	!net-vpn/vipnetclient-cli
+	!net-vpn/vipnetclient-cli-gost
 	x11-libs/libxkbcommon
 	x11-libs/libxcb
 "
@@ -36,12 +38,16 @@ pkg_setup() {
 		echo ${pid} > /tmp/vipnetclient/${user}
 	done
 
+	pkill -x --signal USR1 vipnetclient 2>/dev/null
+
 }
 
 src_unpack() {
 
 	unpack_deb ${A}
 
+# Set owners
+
 	# Переименуем папку systemd чтобы не попал под фильтр INSTALL-MASK
 	mv ${S}/etc/systemd ${S}/etc/_systemd
 
@@ -50,13 +56,21 @@ src_unpack() {
 src_install() {
 
 	mv * "${D}" || die
+
+	# Set owners
+	chown root:root ${D}/usr/bin/vipnetclient 2>/dev/null
+	chown root:root $(ls -1 ${D}/etc/init.d/*vipnetclient) 2>/dev/null
+	chmod 755 $(ls -1 ${D}/etc/init.d/*vipnetclient) 2>/dev/null
+	chown root:root ${D}/usr/bin/vipnetclient-gui 2>/dev/null
+	chown root:root ${D}/usr/bin/vipnetclient-gui-bin 2>/dev/null
+
 }
 
 pkg_postinst() {
 
 	# Копируем файлы службы для systemd, без них не работает
-	mkdir -p /etc/systemd/
-	mv /etc/_systemd/system /etc/systemd/system
+	mkdir -p /etc/systemd/system
+	cp -r /etc/_systemd/system/* /etc/systemd/system/
 	rm -rf /etc/_systemd
 
 	# update man db
@@ -72,25 +86,48 @@ pkg_postinst() {
 	# create service and init scripts
 	if which systemctl >/dev/null 2>&1; then
 		systemctl reset-failed
-		systemctl stop vipnetclientdaemon*
+		systemctl stop vipnetclientdaemon* && elog "Служба установлена"
 	elif which rc-update	>/dev/null 2>&1; then
-		rc-update add vipnetclient default >/dev/null 2>&1
+		rc-update add vipnetclient default && elog "Служба установлена"
 	fi
 
+	# Set capability
 	/usr/bin/vipnetclient --setcap --version
 
+	# Restart each running instance of vipnetclient-gui
+	pkill -f -USR1 vipnetclient-gui-bin 2>/dev/null
+
 	# Update shared libraries paths
-	ldconfig 2>/dev/null
+	#ldconfig 2>/dev/null
+	which ldconfig >/dev/null 2>&1 && ldconfig 2>/dev/null
 }
 
 #
 pkg_prerm ()  {
 
+	GUI_NAME=vipnetclient-gui-bin
+
 	# Удалим мусор
-	rm -rf /etc/systemd/system/vipnetclient_gui_login*
+	rm -rf /etc/systemd/system/vipnetclient*
+
+	pkill -f --signal INT ${GUI_NAME} 2>/dev/null
 
 	# Размонтируем виртуальный диск
 	umount /home/*/.vipnet/var/run
 	umount /root/.vipnet/var/run
 
+	# Update shared libraries paths
+	which ldconfig >/dev/null 2>&1 && ldconfig 2>/dev/null
+
+	# disable service and remove init scripts
+	if which systemctl >/dev/null 2>&1; then
+		systemctl disable vipnetclient >/dev/null 2>&1
+		if [ -f /etc/systemd/system/vipnetclient_gui_login.service ]; then
+			systemctl disable vipnetclient_gui_login >/dev/null 2>&1
+		fi
+	elif which rc-update >/dev/null 2>&1; then
+		rc-update -f vipnetclient remove >/dev/null 2>&1
+	fi
+#	rm -f /etc/rc*/*vipnetclient >/dev/null 2>&1
+
 }