From 55b42bd93b8017038559857ee8e1b8080f743f2d Mon Sep 17 00:00:00 2001
From: xpamych <xpamych@yandex.ru>
Date: Mon, 9 Jan 2023 16:51:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D1=85?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admc-git/lure.sh    | 16 ++++++++--------
 discord-bin/lure.sh | 19 +++++++------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/admc-git/lure.sh b/admc-git/lure.sh
index 871645b..bd5251d 100755
--- a/admc-git/lure.sh
+++ b/admc-git/lure.sh
@@ -12,28 +12,28 @@ conflicts=('admc')
 build_deps=('cmake' 'gcc' 'gcc-c++' 'qt5-qtbase-devel' 'qt5-linguist' 'openldap-devel' 'samba-devel' 'libsmbclient-devel' 'krb5-devel' 'libuuid-devel')
 build_deps_debian=('cmake' 'debhelper' 'qtbase5-dev' 'qttools5-dev' 'libldap2-dev' 'samba-dev' 'libsmbclient-dev' 'libkrb5-dev' 'uuid-dev' 'libsasl2-dev')
 
-sources=("git+https://github.com/altlinux/${provides}.git")
+sources=("git+https://github.com/altlinux/admc.git")
 checksums=('SKIP')
 
 version() {
-	cd "$srcdir/${provides}"
+	cd "$srcdir/admc"
 	git-version
 }
 
 prepare() {
-	cd "${srcdir}/${provides}"
+	cd "${srcdir}/admc"
 	mkdir build
 }
 
 build() {
-	cd "${srcdir}/${provides}/build"
+	cd "${srcdir}/admc/build"
 	cmake ..
 	make -j12
 }
 
 package() {
-	install -Dm755 "${srcdir}/${provides}/build/admc" "${pkgdir}/usr/bin/admc"
-	install -Dm644 "${srcdir}/${provides}/build/libadldap.so" "${pkgdir}/usr/lib/libadldap.so"
-	install -Dm644 "${srcdir}/${provides}/share/admc.desktop" "${pkgdir}/usr/share/applications/admc.desktop"
-	install -Dm644 "${srcdir}/${provides}/share/admc.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/admc.svg"
+	install -Dm755 "${srcdir}/admc/build/admc" "${pkgdir}/usr/bin/admc"
+	install -Dm644 "${srcdir}/admc/build/libadldap.so" "${pkgdir}/usr/lib/libadldap.so"
+	install -Dm644 "${srcdir}/admc/share/admc.desktop" "${pkgdir}/usr/share/applications/admc.desktop"
+	install -Dm644 "${srcdir}/admc/share/admc.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/admc.svg"
 }
diff --git a/discord-bin/lure.sh b/discord-bin/lure.sh
index b58974e..f7ebffa 100755
--- a/discord-bin/lure.sh
+++ b/discord-bin/lure.sh
@@ -11,21 +11,16 @@ conflicts=('discord')
 
 deps=('libXScrnSaver' 'xdg-utils')
 
-sources=("https://dl.discordapp.net/apps/linux/${version}/${provides}-${version}.tar.gz")
+sources=("https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz")
 checksums=('SKIP')
 
-prepare() {
-	cd ${srcdir}
-	sed -i "s|Exec=/usr/share/discord/Discord|Exec=/opt/discord/${provides}|" ./Discord/${provides}.desktop
-}
-
 package() {
-	install -Dm755 "${srcdir}/Discord/Discord" "${pkgdir}/opt/discord/discord"
-	install -Dm644 "${srcdir}/Discord/discord.png" "${pkgdir}/usr/share/pixmaps/${provides}.png"
-	install -Dm644 "${srcdir}/Discord/${provides}.desktop" "${pkgdir}/usr/share/applications/${provides}.desktop"
+	install -Dm755 "${srcdir}/Discord/Discord" "${pkgdir}/usr/share/discord/Discord"
+	install -Dm644 "${srcdir}/Discord/discord.png" "${pkgdir}/usr/share/pixmaps/discord.png"
+	install -Dm644 "${srcdir}/Discord/discord.desktop" "${pkgdir}/usr/share/applications/discord.desktop"
 	cd "${srcdir}/Discord"
-	find . -type d -exec install -d {,"${pkgdir}/opt/discord/"}{} \;
-	find . -type f -exec install -D {,"${pkgdir}/opt/discord/"}{} \;
+	find . -type d -exec install -d {,"${pkgdir}/usr/share/discord/"}{} \;
+	find . -type f -exec install -D {,"${pkgdir}/usr/share/discord/"}{} \;
 	install -dm755 "${pkgdir}/usr/bin/"
-	ln -s "${pkgdir}/opt/${provides}/${provides}" "${pkgdir}/usr/bin/${provides}"
+	ln -s "${pkgdir}/opt/discord/discord" "${pkgdir}/usr/bin/discord"
 }