diff --git a/net-misc/rudesktop-bin/Manifest b/net-misc/rudesktop-bin/Manifest deleted file mode 100644 index 89ed8bd..0000000 --- a/net-misc/rudesktop-bin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rudesktop-amd64.deb 7583664 BLAKE2B 01c46799c5c99ef603c7faa4e945aef12eafb8819c220fd53f18a3887fb2f1391f0c3dc80a7a52bef8e4dd5ffe4178bf78f933f1ea873fa5fa5cf9bdd5d75905 SHA512 3a912ad26f94f16100c13f7d50973c1ff167e955c81dcdc436a10b3feedc6724c80756247c96c394031832ad56d50c7150e5b4d02836f5af0e8a98294e3cbaeb diff --git a/net-misc/rudesktop-bin/rudesktop-bin-2.0.3-r1.ebuild b/net-misc/rudesktop-bin/rudesktop-bin-2.0.3-r2.ebuild similarity index 75% rename from net-misc/rudesktop-bin/rudesktop-bin-2.0.3-r1.ebuild rename to net-misc/rudesktop-bin/rudesktop-bin-2.0.3-r2.ebuild index 2eaafaa..1ed84fa 100644 --- a/net-misc/rudesktop-bin/rudesktop-bin-2.0.3-r1.ebuild +++ b/net-misc/rudesktop-bin/rudesktop-bin-2.0.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI="8" -inherit desktop xdg unpacker +inherit xdg unpacker # Убираем суффикс в названии продукта MY_PN=${PN/-bin/} @@ -12,7 +12,7 @@ DESCRIPTION="A remote control software." HOMEPAGE="https://rudesktop.ru/" SRC_URI="https://${MY_PN}.ru/download/${MY_PN}-amd64.deb" -LICENSE="" +LICENSE="ISC" SLOT="0" KEYWORDS="~amd64" @@ -40,17 +40,17 @@ src_install() { mv * "${D}" || die # Перемещаем библиотеку в подпапку с именем пакета - mkdir -p ${D}/usr/lib/${MY_PN} - mv ${D}/usr/lib/libsciter-gtk.so ${D}/usr/lib/${MY_PN}/ + mkdir -p "${D}/usr/lib/${MY_PN}" + mv "${D}/usr/lib/libsciter-gtk.so" "${D}/usr/lib/${MY_PN}/" # Добавление службы rudesktop INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') if [ "systemd" == "${INITSYS}" ]; then - mkdir -p ${D}/usr/lib/systemd/system - cp ${D}/usr/share/${MY_PN}-client/files/systemd/${MY_PN}.service ${D}/usr/lib/systemd/system/${MY_PN}.service + mkdir -p "${D}/usr/lib/systemd/system" + cp "${D}/usr/share/${MY_PN}-client/files/systemd/${MY_PN}.service" "${D}/usr/lib/systemd/system/${MY_PN}.service" else - mkdir -p ${D}/etc/init.d/ + mkdir -p "${D}/etc/init.d/" echo '#!/sbin/openrc-run name="RuDesktop" description="RuDesktop Daemon Service" @@ -63,15 +63,15 @@ pidfile="/run/rudesktop" depend() { after xdm need net -}' > ${D}/etc/init.d/${MY_PN} +}' > "${D}/etc/init.d/${MY_PN}" # Исправление прав на запуск службы - chmod +x ${D}/etc/init.d/${MY_PN} + chmod +x "${D}/etc/init.d/${MY_PN}" fi # # Исправление ярлыка для меню Пуск - echo "Exec=${MY_PN} %u" >> ${D}/usr/share/applications/${MY_PN}.desktop + echo "Exec=${MY_PN} %u" >> "${D}/usr/share/applications/${MY_PN}.desktop" } pkg_preinst() { @@ -80,7 +80,8 @@ pkg_preinst() { service ${MY_PN} stop || true if [ -e /etc/systemd/system/${MY_PN}.service ]; then - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service + rm -f "/etc/systemd/system/${MY_PN}.service" "/usr/lib/systemd/system/${MY_PN}.service" \ + "/usr/lib/systemd/user/${MY_PN}.service" fi else rc-service ${MY_PN} stop @@ -106,8 +107,8 @@ pkg_postinst() { /usr/bin/${MY_PN} --rendezvous $RUDESKTOP_DOMAIN || true fi - mv /usr/lib/${MY_PN}/libsciter-gtk.so /usr/lib/ - rm -rf /usr/lib/${MY_PN} + mv "/usr/lib/${MY_PN}/libsciter-gtk.so" /usr/lib/ + rm -rf "/usr/lib/${MY_PN}" } pkg_prerm() { @@ -116,12 +117,13 @@ pkg_prerm() { if [ "systemd" == "${INITSYS}" ]; then systemctl stop ${MY_PN} || true systemctl disable ${MY_PN} || true - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service /etc/sudoers.d/${MY_PN} + rm -f "/etc/systemd/system/${MY_PN}.service" "/usr/lib/systemd/system/${MY_PN}.service" \ + "/usr/lib/systemd/user/${MY_PN}.service /etc/sudoers.d/${MY_PN}" else rc-update delete ${MY_PN} rc-service ${MY_PN} stop fi rm -rf /usr/lib/libsciter-gtk.so - rm -rf /usr/share/${MY_PN}-client + rm -rf "/usr/share/${MY_PN}-client" # rm -rf /root/.config/rudesktop || true }