Bumped to 4.0

To solve Packaging scriptlets assume global 'arg' in Lua environment
https://bugzilla.redhat.com/show_bug.cgi?id=1892224
This commit is contained in:
Jiri 2021-04-30 10:52:50 +02:00
parent 988593295e
commit efdd06373d
2 changed files with 310 additions and 305 deletions

View File

@ -6,9 +6,9 @@
Name: copy-jdk-configs Name: copy-jdk-configs
# hash relevant to version tag # hash relevant to version tag
%global htag bf480d4217342a54d3f1103365d21f6e399c4932 %global htag 88d3ed89f30d8b0eb4877d860fa8d951f224f156
Version: 3.9 Version: 4.0
Release: 4.0.pre.0.bf480d4217342a54d3f1103365d21f6e399c4932%{?dist} Release: 0%{?dist}
Summary: JDKs configuration files copier Summary: JDKs configuration files copier
License: BSD License: BSD
@ -72,7 +72,7 @@ rm "%{rpm_state_dir}/%{file}" 2> /dev/null || :
%license LICENSE %license LICENSE
%changelog %changelog
* Thu Apr 29 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-4.0.pre.0.bf480d4217342a54d3f1103365d21f6e399c4932%{?dist} * Thu Apr 29 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-0
- bumped to 4.0 to resolve remvoed rpm 4.17 removing arg from global table - bumped to 4.0 to resolve remvoed rpm 4.17 removing arg from global table
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-8 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-8

View File

@ -144,7 +144,7 @@ for i=1,#arg,2 do
print(" convinient switch to determine jdk's arch") print(" convinient switch to determine jdk's arch")
print(" --jvmDestdir") print(" --jvmDestdir")
print(" Migration/testing switch. Target Mostly same as jvmdir, but you may wont to copy ouside it.") print(" Migration/testing switch. Target Mostly same as jvmdir, but you may wont to copy ouside it.")
print(" --debug") print(" --debug or $debug")
print(" Enables printing out whats going on. true/false. False by default") print(" Enables printing out whats going on. true/false. False by default")
print(" --temp") print(" --temp")
print(" optional file to save intermediate result - directory configs were copied from") print(" optional file to save intermediate result - directory configs were copied from")
@ -194,7 +194,6 @@ if (jvmDestdir == nil) then
jvmDestdir = jvmdir jvmDestdir = jvmdir
end end
if (debug) then if (debug) then
print("--currentjvm:"); print("--currentjvm:");
print(currentjvm); print(currentjvm);
@ -220,7 +219,6 @@ local jvms = { }
debugOneLinePrint("started") debugOneLinePrint("started")
foundJvms = posix.dir(jvmdir); foundJvms = posix.dir(jvmdir);
if (foundJvms == nil) then if (foundJvms == nil) then
debugOneLinePrint("no, or nothing in " .. jvmdir .. " exit") debugOneLinePrint("no, or nothing in " .. jvmdir .. " exit")
@ -265,11 +263,19 @@ table.sort(jvms , function(a,b)
local l2x = tonumber(l2[x]) local l2x = tonumber(l2[x])
if (l1x ~= nil and l2x ~= nil) then if (l1x ~= nil and l2x ~= nil) then
--if hunks are numbers, go with them --if hunks are numbers, go with them
if (l1x < l2x) then return true; end if (l1x < l2x) then
if (l1x > l2x) then return false; end return true;
end
if (l1x > l2x) then
return false;
end
else else
if (l1[x] < l2[x]) then return true; end if (l1[x] < l2[x]) then
if (l1[x] > l2[x]) then return false; end return true;
end
if (l1[x] > l2[x]) then
return false;
end
end end
-- if hunks are equals then move to another pair of hunks -- if hunks are equals then move to another pair of hunks
end end
@ -294,7 +300,6 @@ if ( temp ~= nil ) then
file:close() file:close()
end end
local readlinkOutput = os.tmpname() local readlinkOutput = os.tmpname()
for i, file in pairs(caredFiles) do for i, file in pairs(caredFiles) do