public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/eselect-java:java-vm-update commit in: /, src/modules/
Date: Fri, 24 Jun 2022 09:21:04 +0000 (UTC)	[thread overview]
Message-ID: <1656062460.a9fd19b87c15c4c573ab43b8547a26d6ea894ebc.flow@gentoo> (raw)

commit:     a9fd19b87c15c4c573ab43b8547a26d6ea894ebc
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 07:49:14 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 09:21:00 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=a9fd19b8

Decide based on the UID if system or user VM should be modified

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 NEWS                           |  1 +
 src/modules/java-vm.eselect.in | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index d8ea978..52fbfe5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 NEXT:
     * Add "eselect java-vm update" (#853928)
+    * Decide on UID if system or user VM should be set
 
 0.4.3:
     * install jpackage symlink

diff --git a/src/modules/java-vm.eselect.in b/src/modules/java-vm.eselect.in
index c7d5a82..7c46ff1 100644
--- a/src/modules/java-vm.eselect.in
+++ b/src/modules/java-vm.eselect.in
@@ -116,7 +116,7 @@ describe_set_parameters() {
 }
 
 do_set() {
-	local usage="Usage <user|system> <VM>"
+	local usage="Usage [user|system] <VM>"
 	local ifunset=0
 
 	if [[ ${1} == "--if-unset" ]]; then
@@ -124,6 +124,18 @@ do_set() {
 		shift
 	fi
 
+	# Automatically decide, based in the invoking user's UID, if the
+	# user or system Java VM should be modified.
+	if [[ ${#} -eq 1 ]]; then
+		local kind
+		if [[ ${UID} -eq 0 ]]; then
+			kind="system"
+		else
+			kind="user"
+		fi
+		set -- ${kind} ${@}
+	fi
+
 	if [[ ${#} != 2 ]]; then
 		die -q ${usage}
 	elif [[ ${1} == "system" ]]; then


WARNING: multiple messages have this Message-ID (diff)
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/eselect-java:master commit in: src/modules/, /
Date: Fri, 24 Jun 2022 10:33:37 +0000 (UTC)	[thread overview]
Message-ID: <1656062460.a9fd19b87c15c4c573ab43b8547a26d6ea894ebc.flow@gentoo> (raw)
Message-ID: <20220624103337.2N8IonBq4amrTvzkgvoslycV4uGaa9Xf0RJnkYymTjc@z> (raw)

commit:     a9fd19b87c15c4c573ab43b8547a26d6ea894ebc
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 07:49:14 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 09:21:00 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=a9fd19b8

Decide based on the UID if system or user VM should be modified

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 NEWS                           |  1 +
 src/modules/java-vm.eselect.in | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index d8ea978..52fbfe5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 NEXT:
     * Add "eselect java-vm update" (#853928)
+    * Decide on UID if system or user VM should be set
 
 0.4.3:
     * install jpackage symlink

diff --git a/src/modules/java-vm.eselect.in b/src/modules/java-vm.eselect.in
index c7d5a82..7c46ff1 100644
--- a/src/modules/java-vm.eselect.in
+++ b/src/modules/java-vm.eselect.in
@@ -116,7 +116,7 @@ describe_set_parameters() {
 }
 
 do_set() {
-	local usage="Usage <user|system> <VM>"
+	local usage="Usage [user|system] <VM>"
 	local ifunset=0
 
 	if [[ ${1} == "--if-unset" ]]; then
@@ -124,6 +124,18 @@ do_set() {
 		shift
 	fi
 
+	# Automatically decide, based in the invoking user's UID, if the
+	# user or system Java VM should be modified.
+	if [[ ${#} -eq 1 ]]; then
+		local kind
+		if [[ ${UID} -eq 0 ]]; then
+			kind="system"
+		else
+			kind="user"
+		fi
+		set -- ${kind} ${@}
+	fi
+
 	if [[ ${#} != 2 ]]; then
 		die -q ${usage}
 	elif [[ ${1} == "system" ]]; then


             reply	other threads:[~2022-06-24  9:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-24  9:21 Florian Schmaus [this message]
2022-06-24 10:33 ` [gentoo-commits] proj/eselect-java:master commit in: src/modules/, / Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2022-06-24  8:17 [gentoo-commits] proj/eselect-java:java-vm-update commit in: /, src/modules/ Florian Schmaus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1656062460.a9fd19b87c15c4c573ab43b8547a26d6ea894ebc.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox