* [gentoo-commits] repo/proj/guru:dev commit in: games-action/ATLauncher/, games-action/ATLauncher/files/
@ 2020-03-25 14:11 Andrew Ammerlaan
2020-03-25 14:17 ` [gentoo-commits] repo/proj/guru:master commit in: games-action/ATLauncher/files/, games-action/ATLauncher/ Andrew Ammerlaan
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Ammerlaan @ 2020-03-25 14:11 UTC (permalink / raw
To: gentoo-commits
commit: 90f68e556c38e1d98703c85c82ac0d53e2268959
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar 25 14:08:24 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar 25 14:08:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=90f68e55
games-action/ATLauncher: use java-pkg-2 eclass
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild | 10 ++++------
games-action/ATLauncher/files/ATLauncher | 7 ++-----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild b/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild
index 63800d4..7d89298 100644
--- a/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild
+++ b/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit desktop xdg
+inherit desktop java-pkg-2 xdg
DESCRIPTION="Minecraft launcher which integrates multiple different ModPacks"
HOMEPAGE="https://atlauncher.com
@@ -31,13 +31,11 @@ src_compile() {
}
src_install() {
- dodir /opt/${PN}
- insinto /opt/${PN}/
- newins "${DISTDIR}/${P}.jar" ${PN}.jar
+ java-pkg_newjar "${DISTDIR}/${P}.jar" ${P}.jar
- insinto /opt/bin/
+ insinto /usr/bin/
doins "${FILESDIR}/${PN}"
- fperms +x /opt/bin/${PN}
+ fperms +x /usr/bin/${PN}
newicon -s 256x256 ${PN}-0.png ${PN}.png
newicon -s 128x128 ${PN}-1.png ${PN}.png
diff --git a/games-action/ATLauncher/files/ATLauncher b/games-action/ATLauncher/files/ATLauncher
index 4b6ed4c..234d8ed 100755
--- a/games-action/ATLauncher/files/ATLauncher
+++ b/games-action/ATLauncher/files/ATLauncher
@@ -2,9 +2,6 @@
# we need to execute this in a user writeable directory
-if [ ! -f ${HOME}/ATLauncher/ATLauncher.jar ]; then
- mkdir -p ${HOME}/.local/share/ATLauncher
- cp /opt/ATLauncher/ATLauncher.jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar
-fi
-
+mkdir -p ${HOME}/.local/share/ATLauncher
+cp /usr/share/ATLauncher/lib/ATLauncher-*.jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar
java -jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-action/ATLauncher/files/, games-action/ATLauncher/
2020-03-25 14:11 [gentoo-commits] repo/proj/guru:dev commit in: games-action/ATLauncher/, games-action/ATLauncher/files/ Andrew Ammerlaan
@ 2020-03-25 14:17 ` Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2020-03-25 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 90f68e556c38e1d98703c85c82ac0d53e2268959
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar 25 14:08:24 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar 25 14:08:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=90f68e55
games-action/ATLauncher: use java-pkg-2 eclass
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild | 10 ++++------
games-action/ATLauncher/files/ATLauncher | 7 ++-----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild b/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild
index 63800d4..7d89298 100644
--- a/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild
+++ b/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit desktop xdg
+inherit desktop java-pkg-2 xdg
DESCRIPTION="Minecraft launcher which integrates multiple different ModPacks"
HOMEPAGE="https://atlauncher.com
@@ -31,13 +31,11 @@ src_compile() {
}
src_install() {
- dodir /opt/${PN}
- insinto /opt/${PN}/
- newins "${DISTDIR}/${P}.jar" ${PN}.jar
+ java-pkg_newjar "${DISTDIR}/${P}.jar" ${P}.jar
- insinto /opt/bin/
+ insinto /usr/bin/
doins "${FILESDIR}/${PN}"
- fperms +x /opt/bin/${PN}
+ fperms +x /usr/bin/${PN}
newicon -s 256x256 ${PN}-0.png ${PN}.png
newicon -s 128x128 ${PN}-1.png ${PN}.png
diff --git a/games-action/ATLauncher/files/ATLauncher b/games-action/ATLauncher/files/ATLauncher
index 4b6ed4c..234d8ed 100755
--- a/games-action/ATLauncher/files/ATLauncher
+++ b/games-action/ATLauncher/files/ATLauncher
@@ -2,9 +2,6 @@
# we need to execute this in a user writeable directory
-if [ ! -f ${HOME}/ATLauncher/ATLauncher.jar ]; then
- mkdir -p ${HOME}/.local/share/ATLauncher
- cp /opt/ATLauncher/ATLauncher.jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar
-fi
-
+mkdir -p ${HOME}/.local/share/ATLauncher
+cp /usr/share/ATLauncher/lib/ATLauncher-*.jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar
java -jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-25 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-25 14:11 [gentoo-commits] repo/proj/guru:dev commit in: games-action/ATLauncher/, games-action/ATLauncher/files/ Andrew Ammerlaan
2020-03-25 14:17 ` [gentoo-commits] repo/proj/guru:master commit in: games-action/ATLauncher/files/, games-action/ATLauncher/ Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox