From 97d94129069508c31190bb9a1a8811bccdaa8530 Mon Sep 17 00:00:00 2001 From: F0X Date: Sun, 23 May 2021 18:03:56 +0200 Subject: [PATCH 1/2] MultiMC: Remove wrapper script (#31077) --- srcpkgs/MultiMC/files/MultiMC.sh | 2 -- srcpkgs/MultiMC/template | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh deleted file mode 100644 index 271794952e82..000000000000 --- a/srcpkgs/MultiMC/files/MultiMC.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/libexec/multimc/multimc -d ~/.multimc diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template index 6f19fc623d0a..f4b3da2f3d4a 100644 --- a/srcpkgs/MultiMC/template +++ b/srcpkgs/MultiMC/template @@ -1,7 +1,7 @@ # Template file for 'MultiMC' pkgname=MultiMC version=0.6.12 -revision=2 +revision=3 wrksrc="${pkgname}5-${version}" _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4" _nbtversion="multimc-0.6.1" @@ -35,9 +35,6 @@ pre_configure() { } post_install() { - vmkdir usr/libexec/multimc - mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc" - vbin "${FILESDIR}/MultiMC.sh" MultiMC vinstall build/libMultiMC_nbt++.so 755 /usr/lib vinstall build/libMultiMC_quazip.so 755 /usr/lib vinstall application/package/linux/multimc.desktop 644 /usr/share/applications From 2f8688dd3a919837f3cb547e69148fed6ec3b012 Mon Sep 17 00:00:00 2001 From: F0X Date: Mon, 24 May 2021 11:02:07 +0200 Subject: [PATCH 2/2] MultiMC: Use correct name in desktop file --- srcpkgs/MultiMC/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template index f4b3da2f3d4a..5b5fdc922110 100644 --- a/srcpkgs/MultiMC/template +++ b/srcpkgs/MultiMC/template @@ -38,6 +38,5 @@ post_install() { vinstall build/libMultiMC_nbt++.so 755 /usr/lib vinstall build/libMultiMC_quazip.so 755 /usr/lib vinstall application/package/linux/multimc.desktop 644 /usr/share/applications - vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/' vinstall application/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps }