From cbfcea3a321f1db9aae89dcdb2c96a0cac89b67b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 26 Sep 2017 18:05:30 +0200 Subject: [PATCH] Updated to v3 - symlink support --- copy-jdk-configs.spec | 6 +- copy_jdk_configs.lua | 141 +++++++++++++++++------------------ copy_jdk_configs_fixFiles.sh | 56 ++++++++++++-- 3 files changed, 122 insertions(+), 81 deletions(-) diff --git a/copy-jdk-configs.spec b/copy-jdk-configs.spec index bfdc5b9..60690bb 100644 --- a/copy-jdk-configs.spec +++ b/copy-jdk-configs.spec @@ -6,9 +6,9 @@ Name: copy-jdk-configs # hash relevant to version tag -%global htag 3f9d6c4448f867a95fb166416a41c45c7e795c10 -Version: 2.3 -Release: 2%{?dist} +%global htag c85eebe7ab9979810e5e1ee2a48eaf3dfa873b36 +Version: 3.0 +Release: 1%{?dist} Summary: JDKs configuration files copier License: BSD diff --git a/copy_jdk_configs.lua b/copy_jdk_configs.lua index d22df06..a8387ae 100755 --- a/copy_jdk_configs.lua +++ b/copy_jdk_configs.lua @@ -159,6 +159,12 @@ if (debug) then print(debug); end +local function debugOneLinePrint(string) + if (debug) then + print(string) + end; +end + --trasnform substitute names to lua patterns local name = string.gsub(string.gsub(origname, "%-", "%%-"), "%.", "%%.") @@ -166,6 +172,11 @@ local javaver = string.gsub(origjavaver, "%.", "%%.") local jvms = { } +function getPath(str,sep) + sep=sep or '/' + return str:match("(.*"..sep..")") +end + function splitToTable(source, pattern) local i1 = string.gmatch(source, pattern) local l1 = {} @@ -186,33 +197,44 @@ function trim(s) return (s:gsub("^%s*(.-)%s*$", "%1")) end +local function dirWithParents(path) + local s = "" + local dirs = splitToTable(path, "[^/]+") + for i,d in pairs(dirs) do + if (i == #dirs) then + break + end + s = s.."/"..d + local stat2 = posix.stat(s, "type"); + if (stat2 == nil) then + debugOneLinePrint(s.." does not exists, creating") + if (not dry) then + posix.mkdir(s) + end + else + debugOneLinePrint(s.." exists,not creating") + end + end +end + + +debugOneLinePrint("started") -if (debug) then - print("started") -end; foundJvms = posix.dir(jvmdir); if (foundJvms == nil) then - if (debug) then - print("no, or nothing in "..jvmdir.." exit") - end; + debugOneLinePrint("no, or nothing in "..jvmdir.." exit") return end -if (debug) then - print("found "..#foundJvms.."jvms") -end; +debugOneLinePrint("found "..#foundJvms.."jvms") for i,p in pairs(foundJvms) do -- regex similar to %{_jvmdir}/%{name}-%{javaver}*%{_arch} bash command if (string.find(p, name.."%-"..javaver..".*"..arch) ~= nil ) then - if (debug) then - print("matched: "..p) - end; + debugOneLinePrint("matched: "..p) if (currentjvm == p) then - if (debug) then - print("this jdk is already installed. exiting lua script") - end; + debugOneLinePrint("this jdk is already installed. exiting lua script") return end ; if (string.match(p, ".*-debug$")) then @@ -221,22 +243,16 @@ for i,p in pairs(foundJvms) do table.insert(jvms, p) end else - if (debug) then - print("NOT matched: "..p) - end; + debugOneLinePrint("NOT matched: "..p) end end if (#jvms <=0) then - if (debug) then - print("no matching jdk in "..jvmdir.." exit") - end; + debugOneLinePrint("no matching jdk in "..jvmdir.." exit") return end; -if (debug) then - print("matched "..#jvms.." jdk in "..jvmdir) -end; +debugOneLinePrint("matched "..#jvms.." jdk in "..jvmdir) --full names are like java-1.7.0-openjdk-1.7.0.60-2.4.5.1.fc20.x86_64 table.sort(jvms , function(a,b) @@ -272,9 +288,7 @@ latestjvm = jvms[#jvms] if ( temp ~= nil ) then src=jvmdir.."/"..latestjvm - if (debug) then - print("temp declared as "..temp.." saving used dir of "..src) - end + debugOneLinePrint("temp declared as "..temp.." saving used dir of "..src) file = io.open (temp, "w") file:write(src) file:close() @@ -286,59 +300,44 @@ local readlinkOutput=os.tmpname() for i,file in pairs(caredFiles) do local SOURCE=jvmdir.."/"..latestjvm.."/"..file local DEST=jvmDestdir.."/"..currentjvm.."/"..file - if (debug) then - print("going to copy "..SOURCE) - print("to "..DEST) - end; + debugOneLinePrint("going to copy "..SOURCE) + debugOneLinePrint("to "..DEST) local stat1 = posix.stat(SOURCE, "type"); if (stat1 ~= nil) then - if (debug) then - print(SOURCE.." exists") - end; - local s = "" - local dirs = splitToTable(DEST, "[^/]+") - for i,d in pairs(dirs) do - if (i == #dirs) then - break - end - s = s.."/"..d - local stat2 = posix.stat(s, "type"); - if (stat2 == nil) then - if (debug) then - print(s.." does not exists, creating") - end; - if (not dry) then - posix.mkdir(s) - end - else - if (debug) then - print(s.." exists,not creating") - end; - end - end + debugOneLinePrint(SOURCE.." exists") + dirWithParents(DEST) -- Copy with -a to keep everything intact local exe = "cp".." -ar "..SOURCE.." "..DEST local linkExe = "readlink".." -f "..SOURCE.." > "..readlinkOutput - if (debug) then - print("executing "..linkExe) - end; + debugOneLinePrint("executing "..linkExe) + os.remove(readlinkOutput) os.execute(linkExe) local link=trim(slurp(readlinkOutput)) - if (debug) then - print(" ...link is "..link) - end + debugOneLinePrint(" ...link is "..link) if (not ((link) == (SOURCE))) then - print("WARNING link "..link.." where file "..SOURCE.."expected!") - end - if (debug) then - print("executing "..exe) - end; - if (not dry) then - os.execute(exe) + debugOneLinePrint("WARNING link "..link.." where file "..SOURCE.." expected!") + debugOneLinePrint("Will try to copy link target rather then link itself!") +--replacing any NVRA by future NVRA (still execting to have NVRA for any multiple-installable targets +-- lua stubbornly consider dash as inteval. Replacing by dot to match X-Y more correct as X.Y rather then not at all + local linkDest=string.gsub(link, latestjvm:gsub("-", "."), currentjvm) + debugOneLinePrint("attempting to copy "..link.." to "..linkDest) + if (link == linkDest) then + debugOneLinePrint("Those are identical files! Nothing to do!") + else + local exe2 = "cp".." -ar "..link.." "..linkDest + dirWithParents(linkDest) + debugOneLinePrint("executing "..exe2) + if (not dry) then + os.execute(exe2) + end + end + else + debugOneLinePrint("executing "..exe) + if (not dry) then + os.execute(exe) + end end else - if (debug) then - print(SOURCE.." does not exists") - end; + debugOneLinePrint(SOURCE.." does not exists") end end diff --git a/copy_jdk_configs_fixFiles.sh b/copy_jdk_configs_fixFiles.sh index d027784..d8d8838 100755 --- a/copy_jdk_configs_fixFiles.sh +++ b/copy_jdk_configs_fixFiles.sh @@ -58,9 +58,51 @@ if [ ! -d "$source" ] ; then exit 33 fi + +listLinks(){ + find $1 -type l -print0 | xargs -0 ls -ld | sed "s;.* $1;$1;" | sed "s; \+;_;g" +} + +createListOfLinksTargetsDirectories(){ + pushd $source >/dev/null 2>&1 + local links=`listLinks $1` + for x in $links ; do + local ffileCandidate=$(echo $x | sed "s/.*_->_//") ; +# ignoring relative paths as they may lead who know where later +# there can be simlink relative to position, so push is not catching all + if [ "$ffileCandidate" != "${ffileCandidate#/}" ] ; then + if [ -d $ffileCandidate ] ; then +# should we accept the links to directories themselves? + echo $ffileCandidate + else + dirname $ffileCandidate + fi + fi + done | sort | uniq + popd >/dev/null 2>&1 +} + +sourceLinks=`listLinks $source` +targetLinks=`listLinks $target` +sourceLinksDirsTarget=`createListOfLinksTargetsDirectories $source` +targetLinksDirsTarget=`createListOfLinksTargetsDirectories $target` + debug "source: $source" debug "target: $target" +debug "sourceLinks: +$sourceLinks" +debug "targetLinks: +$targetLinks" + +debug "sourceLinksDirsTarget: +$sourceLinksDirsTarget" +debug "targetLinksDirsTarget: +$targetLinksDirsTarget" + +sourceSearchPath="$source $sourceLinksDirsTarget" +targetSearchPath="$target $targetLinksDirsTarget" + work(){ if [ "X$1" == "Xrpmnew" -o "X$1" == "Xrpmorig" ] ; then debug "Working with $1 (1)" @@ -69,7 +111,7 @@ work(){ return 1 fi - local files=`find $target | grep "\\.$1$"` + local files=`find $targetSearchPath | grep "\\.$1$"` for file in $files ; do local sf1=`echo $file | sed "s/\\.$1$//"` local sf2=`echo $sf1 | sed "s/$targetName/$srcName/"` @@ -110,7 +152,7 @@ work rpmorig debug "Working with rpmorig (2)" # simply moving old rpmsaves to new dir # fix for config (replace) leftovers -files=`find $source | grep "\\.rpmorig$"` +files=`find $sourceSearchPath | grep "\\.rpmorig$"` for file in $files ; do rpmsaveTarget=`echo $file | sed "s/$srcName/$targetName/"` debug "relocating $file to $rpmsaveTarget" @@ -122,7 +164,7 @@ files=`find $source | grep "\\.rpmorig$"` done debug "Working with rpmsave (1)" -files=`find $source | grep "\\.rpmsave$"` +files=`find $sourceSearchPath | grep "\\.rpmsave$"` for file in $files ; do rpmsaveTarget=`echo $file | sed "s/$srcName/$targetName/"` debug "relocating $file to $rpmsaveTarget" @@ -149,11 +191,11 @@ done debug "cleaning legacy leftowers" if [ "x$debug" == "xtrue" ] ; then - find $source -empty -type d -delete - rmdir $rma $source + find $sourceSearchPath -empty -type d -delete + rmdir $rma $sourceSearchPath else - find $source -empty -type d -delete 2>/dev/null >/dev/null - rmdir $rma $source 2>/dev/null >/dev/null + find $sourceSearchPath -empty -type d -delete 2>/dev/null >/dev/null + rmdir $rma $sourceSearchPath 2>/dev/null >/dev/null fi # and remove placeholders