Skip to content

Commit 152a277

Browse files
committed
Add an option to explicitly set the name of the configuration file for Java launcher script
1 parent d6d3a63 commit 152a277

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

macros.d/macros.jpackage

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
# %5 the name of script you wish to create
3030
# [-h]
3131
# do not set default JAVA_HOME
32+
# [-c <config file name>]
33+
# name of the configuration file
3234
#
3335
%jpackage_script() \
3436
install -d -m 755 %{buildroot}%{_bindir} \
@@ -45,13 +47,13 @@ JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\
4547
. @{javadir}-utils/java-functions\
4648
\
4749
# Source system prefs\
48-
if [ -f %{_sysconfdir}/java/%{name}.conf ] ; then\
49-
. %{_sysconfdir}/java/%{name}.conf\
50+
if [ -f %{_sysconfdir}/java/%{-c*}%{!-c:%{name}}.conf ] ; then\
51+
. %{_sysconfdir}/java/%{-c*}%{!-c:%{name}}.conf\
5052
fi\
5153
\
5254
# Source user prefs\
53-
if [ -f \\$HOME/.%{name}rc ] ; then\
54-
. \\$HOME/.%{name}rc\
55+
if [ -f \\$HOME/.%{-c*}%{!-c:%{name}}rc ] ; then\
56+
. \\$HOME/.%{-c*}%{!-c:%{name}}rc\
5557
fi\
5658
\
5759
# Configuration\

0 commit comments

Comments
 (0)