Updated to v3 - symlink support

copy-jdk-configs.spec

@@ -6,9 +6,9 @@
 Name:    copy-jdk-configs
 
 # hash relevant to version tag
-%global  htag 3f9d6c4448f867a95fb166416a41c45c7e795c10
+%global  htag c85eebe7ab9979810e5e1ee2a48eaf3dfa873b36
-Version: 2.3
+Version: 3.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: JDKs configuration files copier
 
 License:  BSD

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
+  debugOneLinePrint("no, or nothing in "..jvmdir.." exit")
-    print("no, or nothing in "..jvmdir.." exit")
-  end;
   return
 end
 
-if (debug) then
+debugOneLinePrint("found "..#foundJvms.."jvms")
-  print("found "..#foundJvms.."jvms")
-end;
 
 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
+    debugOneLinePrint("matched:  "..p)
-      print("matched:  "..p)
-    end;
     if (currentjvm ==  p) then
-      if (debug) then
+      debugOneLinePrint("this jdk is already installed. exiting lua script")
-        print("this jdk is already installed. exiting lua script")
-      end;
       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
+    debugOneLinePrint("NOT matched:  "..p)
-      print("NOT matched:  "..p)
-    end;
   end
 end
 
 if (#jvms <=0) then 
-  if (debug) then
+  debugOneLinePrint("no matching jdk in "..jvmdir.." exit")
-    print("no matching jdk in "..jvmdir.." exit")
-  end;
   return
 end;
 
-if (debug) then
+debugOneLinePrint("matched "..#jvms.." jdk in "..jvmdir)
-  print("matched "..#jvms.." jdk in "..jvmdir)
-end;
 
 --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
+  debugOneLinePrint("temp declared as "..temp.." saving used dir of "..src)
-    print("temp declared as "..temp.." saving used dir of "..src)
-  end
   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
+  debugOneLinePrint("going to copy "..SOURCE)
-    print("going to copy "..SOURCE)
+  debugOneLinePrint("to  "..DEST)
-    print("to  "..DEST)
-  end;
   local stat1 = posix.stat(SOURCE, "type");
   if (stat1 ~= nil) then
-  if (debug) then
+  debugOneLinePrint(SOURCE.." exists")
-    print(SOURCE.." exists")
+  dirWithParents(DEST)
-  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
 -- Copy with -a to keep everything intact
     local exe = "cp".." -ar "..SOURCE.." "..DEST
     local linkExe = "readlink".." -f "..SOURCE.." > "..readlinkOutput
-    if (debug) then
+    debugOneLinePrint("executing "..linkExe)
-      print("executing "..linkExe)
+    os.remove(readlinkOutput)
-    end;
     os.execute(linkExe)
     local link=trim(slurp(readlinkOutput))
-    if (debug) then
+    debugOneLinePrint("  ...link is "..link)
-      print("  ...link is "..link)
-    end
     if (not ((link) == (SOURCE))) then
-      print("WARNING link "..link.." where file "..SOURCE.."expected!")
+      debugOneLinePrint("WARNING link "..link.." where file "..SOURCE.." expected!")
-    end
+      debugOneLinePrint("Will try to copy link target rather then link itself!")
-    if (debug) then
+--replacing  any NVRA by future NVRA (still execting to have NVRA for any multiple-installable targets
-      print("executing "..exe)
+-- lua stubbornly consider dash as inteval. Replacing by dot to match X-Y more correct as X.Y rather then not at all
-    end;    
+      local linkDest=string.gsub(link, latestjvm:gsub("-", "."), currentjvm)
-    if (not dry) then
+      debugOneLinePrint("attempting to copy "..link.." to "..linkDest)
-      os.execute(exe)
+      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
+    debugOneLinePrint(SOURCE.." does not exists")
-      print(SOURCE.." does not exists")
-    end;
   end
 end

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
+  find $sourceSearchPath -empty -type d -delete
-  rmdir $rma $source
+  rmdir $rma $sourceSearchPath
 else
-  find $source -empty -type d -delete 2>/dev/null >/dev/null
+  find $sourceSearchPath -empty -type d -delete 2>/dev/null >/dev/null
-  rmdir $rma $source 2>/dev/null >/dev/null
+  rmdir $rma $sourceSearchPath 2>/dev/null >/dev/null
 fi
 
 # and remove placeholders