[PR PATCH] MultiMC: Remove wrapper script (#31077)

[PR PATCH] MultiMC: Remove wrapper script (#31077)

[F0Xde]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

There is a new pull request by F0Xde against master on the void-packages repository

https://github.com/F0Xde/void-packages multimc
https://github.com/void-linux/void-packages/pull/31079

MultiMC: Remove wrapper script (#31077)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/31079.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-multimc-31079.patch --]
[-- Type: text/x-diff, Size: 1424 bytes --]

From 26aa790074c656f3c03ebb02f6fa3ee08ec5f04c Mon Sep 17 00:00:00 2001
From: F0X <f0xde@protonmail.com>
Date: Sun, 23 May 2021 18:03:56 +0200
Subject: [PATCH] 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

Re: MultiMC: Remove wrapper script (#31077)

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/31079#issuecomment-846595417

Comment:
Could keep the wrapper script for compatibility?

Re: MultiMC: Remove wrapper script (#31077)

[F0Xde]

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

New comment by F0Xde on void-packages repository

https://github.com/void-linux/void-packages/pull/31079#issuecomment-846599278

Comment:
We could, but having two installed binaries is potentially confusing and I don't think that such an opinionated decision is meant to be done by the packaging system. Users that really want the data directory `~/.multimc` can easily create this wrapper script themself.

But I agree, maybe there should be some kind of warning issued about this change (don't know if / how this would be possible though).

Re: MultiMC: Remove wrapper script (#31077)

[F0Xde]

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

New comment by F0Xde on void-packages repository

https://github.com/void-linux/void-packages/pull/31079#issuecomment-846599278

Comment:
We could, but having two installed binaries is potentially confusing and I don't think that such an opinionated decision is meant to be done by the packaging system. Users that really want the data directory `~/.multimc` can easily create this wrapper script themself.

But I agree, maybe there should be some kind of warning issued about this change (don't know if / how that would be possible though).

Edit: The problem with keeping the script for compatibility is that without any additional information this will probably just create more confusion than actually helping people, and at some point it should definitely be removed, which would still be a breaking change and possibly unexpected by the users.

Re: [PR PATCH] [Updated] MultiMC: Remove wrapper script (#31077)

[F0Xde]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

There is an updated pull request by F0Xde against master on the void-packages repository

https://github.com/F0Xde/void-packages multimc
https://github.com/void-linux/void-packages/pull/31079

MultiMC: Remove wrapper script (#31077)
See #31077 

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/31079.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-multimc-31079.patch --]
[-- Type: text/x-diff, Size: 2271 bytes --]

From 26aa790074c656f3c03ebb02f6fa3ee08ec5f04c Mon Sep 17 00:00:00 2001
From: F0X <f0xde@protonmail.com>
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 58193b1609c3489cdaf9e38883ad6f22b87c892e Mon Sep 17 00:00:00 2001
From: F0X <f0xde@protonmail.com>
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
 }

Re: [PR PATCH] [Updated] MultiMC: Remove wrapper script (#31077)

[F0Xde]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

There is an updated pull request by F0Xde against master on the void-packages repository

https://github.com/F0Xde/void-packages multimc
https://github.com/void-linux/void-packages/pull/31079

MultiMC: Remove wrapper script (#31077)
See #31077 

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/31079.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-multimc-31079.patch --]
[-- Type: text/x-diff, Size: 2271 bytes --]

From 97d94129069508c31190bb9a1a8811bccdaa8530 Mon Sep 17 00:00:00 2001
From: F0X <f0xde@protonmail.com>
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 <f0xde@protonmail.com>
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
 }

Re: MultiMC: Remove wrapper script (#31077)

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/31079#issuecomment-1132374779

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: MultiMC: Remove wrapper script (#31077)

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

There's a closed pull request on the void-packages repository

MultiMC: Remove wrapper script (#31077)
https://github.com/void-linux/void-packages/pull/31079

Description:
See #31077 

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR