Исправление ошибок в ebuild net-misc/assistant

net-misc/assistant/assistant-4.9.0-r1.ebuild

@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop xdg unpacker
+
+DESCRIPTION="Ассистент - удобный инструмент для безопасного удаленного доступа."
+HOMEPAGE="https://мойассистент.рф/"
+SRC_URI="
+https://xn--80akicokc0aablc.xn--p1ai/%D1%81%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C/Download/457 -> ${P}.deb
+"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64"
+
+# Зависимости для запуска этой программы
+RDEPEND="
+	app-shells/bash
+	x11-libs/gtk+:2
+	sys-process/procps
+"
+
+RESTRICT="bindist mirror strip"
+
+S=${WORKDIR}
+
+ASISTDIR="opt/${PN}"
+SCRIPTS_DIR="/${ASISTDIR}/scripts"
+
+
+src_install() {
+	doins -r .
+
+	sed -i -E -e 's/^pidfile=/#pidfile=/' ${D}${SCRIPTS_DIR}/openrc.s
+
+	echo -e "\nstart() {
+        /opt/assistant/scripts/runasts.sh
+}" >> ${D}${SCRIPTS_DIR}/openrc.s
+
+}
+
+pkg_postinst() {
+	# Исправляем права на файлы и папки
+	chmod -R +x /${ASISTDIR}/{bin,lang}
+	chmod -R +x /${SCRIPTS_DIR}
+	chmod -R -x /${SCRIPTS_DIR}/${PN}.service
+	chmod -R a+rw /${ASISTDIR}/{license,log,screenshot,video}
+
+	/${SCRIPTS_DIR}/setup.sh --install
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_prerm() {
+	bash "${SCRIPTS_DIR}/setup.sh --uninstall"
+}
+
+pkg_postrm() {
+	# Зачистка мусора
+	rc-update delete zassistantd
+	eselect rc stop zassistantd
+
+	killall asts astrct assistant 2> /dev/null
+
+	# Удалить ярлык
+	rm -f /usr/share/applications/assistant.desktop || die
+
+	# Удалить службу
+	rm -f /etc/init.d/zassistantd || die
+
+	# Удалить каталог с журналами после удаления
+	rm -r -f /opt/assistant || die
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}

net-misc/assistant/assistant-4.9.0.ebuild

@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop xdg unpacker
-
-DESCRIPTION="Ассистент - удобный инструмент для безопасного удаленного доступа."
-HOMEPAGE="https://мойассистент.рф/"
-SRC_URI="
-https://xn--80akicokc0aablc.xn--p1ai/%D1%81%D0%BA%D0%B0%D1%87%D0%B0%D1%82%D1%8C/Download/574 -> ${P}.deb
-"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64"
-
-# Зависимости для запуска этой программы
-RDEPEND="
-	app-shells/bash
-	x11-libs/gtk+:2
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-ASISTDIR="opt/${PN}/scripts"
-
-
-INST_DIR="/opt/${PN}"
-LOG_FILE=$INST_DIR/log/setup.log
-SHORTCUT_PATH=$INST_DIR/scripts/assistant.desktop
-PATH_TO_CONF=/.config/user-dirs.dirs
-TRUST="/etc/X11/trusted"
-CERT_PATH=/etc/assistant/cert/ca-cert-native
-PATHS_TO_CERT=(
-"/etc/ssl/certs/ca-certificates.crt"
-"/etc/pki/tls/certs/ca-bundle.crt"
-"/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"
-"/usr/share/ca-certificates/ca-bundle.crt"
-"/etc/ssl/certs/ssl-cert-snakeoil.pem"
-"/etc/ca-certificates/extracted/ca-bundle.trust.crt"
-"/var/lib/ca-certificates/ca-bundle.pem"
-)
-
-SCRIPTS_DIR="/opt/${PN}/scripts"
-
-
-src_unpack() {
-        unpack_deb ${A}
-}
-
-src_prepare() {
-	killall asts astrct assistant 2> /dev/null
-	sleep 1s
-	default
-}
-
-src_install() {
-	mv * "${D}" || die
-}
-
-pkg_postinst() {
-	[[ -d /usr/share/applications ]] && cp -p ${INST_DIR}/scripts/assistant.desktop /usr/share/applications/
-	if [ $? == 0 ]; then
-		elog "Added shortcut to application list"
-	else
-		elog "Failed to add shortcut to application list"
-	fi
-
-	rm -f ${SHORTCUT_PATH}
-
-	/sbin/rc-update delete zassistantd
-	/sbin/rc-service zassistantd stop
-
-	cp -f ${SCRIPTS_DIR}/openrc.s /etc/init.d/zassistantd
-	cp -f ${SCRIPTS_DIR}/openrc.t ${SCRIPTS_DIR}/runasts.sh
-	cp -f ${SCRIPTS_DIR}/ast_restart.t ${SCRIPTS_DIR}/ast_restart.sh
-
-	/sbin/rc-update add zassistantd default
-	/sbin/rc-service zassistantd start
-
-	rm -f ${SCRIPTS_DIR}/assistant.service
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To run Assistant as background service use:"
-		elog
-		elog "OpenRC:"
-		elog "# rc-service zassistantd start"
-		elog "# rc-update add zassistantd default"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start zassistantd.service"
-		elog "# systemctl enable zassistantd.service"
-		elog
-	fi
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	bash "/${ASISTDIR}/setup.sh --uninstall"
-
-	rc-update delete zassistantd
-	eselect rc stop zassistantd
-
-	killall asts astrct assistant 2> /dev/null
-
-	# Удалить ярлык
-	rm -f /usr/share/applications/assistant.desktop || die
-
-	# Удалить службу
-	rm -f /etc/init.d/zassistantd || die
-
-	# Удалить каталог с журналами после удаления
-	rm -r /opt/assistant || die
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-}

net-misc/assistant/assistant-5.0.0-r1.ebuild

@@ -54,9 +54,12 @@ pkg_postinst() {
 	xdg_icon_cache_update
 }
 
-pkg_postrm() {
+pkg_prerm() {
 	bash "${SCRIPTS_DIR}/setup.sh --uninstall"
+}
 
+pkg_postrm() {
+	# Зачистка мусора
 	rc-update delete zassistantd
 	eselect rc stop zassistantd