From af29c16382df045311ed6f7fc9688aa1b0cfff68 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: May 07 2021 11:45:25 +0000 Subject: nil arg everywhere it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua" --- diff --git a/call-source.lua b/call-source.lua index 0ab6100..1513d88 100755 --- a/call-source.lua +++ b/call-source.lua @@ -40,7 +40,7 @@ else return end end --- run content of included file with fake args +arg = nil ; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua" cjc = require "copy_jdk_configs.lua" -arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} -cjc.mainProgram(arg) +args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} +cjc.mainProgram(args) diff --git a/java-10-super.spec b/java-10-super.spec index 6972864..a962464 100644 --- a/java-10-super.spec +++ b/java-10-super.spec @@ -52,7 +52,7 @@ Requires: /usr/sbin/update-alternatives BuildRequires: dos2unix, jpackage-utils >= 0:1.5.38, sed, %{_bindir}/perl Requires(post): /usr/sbin/update-alternatives Requires(postun): /usr/sbin/update-alternatives -Requires: copy-jdk-configs >= 3.2 +Requires: copy-jdk-configs >= 4.0 %description This package contains the Super Java Runtime Environment. @@ -252,10 +252,10 @@ else return end end --- run content of included file with fake args +arg = nil ; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua" cjc = require "copy_jdk_configs.lua" -arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} -cjc.mainProgram(arg) +args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} +cjc.mainProgram(args) %post devel