dateibeziehungen.pas: erst Quell-, dann Zielsummen erneuern

2 files changed, 59 insertions, 64 deletions

diff --git a/Make.lps b/Make.lps
index f79d551..a5c0ce1 100644
--- a/Make.lps
+++ b/Make.lps
@@ -31,7 +31,7 @@
         <Filename Value="../units/mystringlistunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="255"/>
+        <TopLine Value="287"/>
         <CursorPos X="14" Y="322"/>
         <UsageCount Value="82"/>
         <Loaded Value="True"/>
@@ -42,8 +42,8 @@
         <UnitName Value="dateiBeziehungen"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="992"/>
-        <CursorPos X="117" Y="1003"/>
+        <TopLine Value="599"/>
+        <CursorPos X="62" Y="627"/>
         <FoldState Value=" T3ja03B41219"/>
         <UsageCount Value="74"/>
         <Loaded Value="True"/>
@@ -97,9 +97,9 @@
       <Unit12>
         <Filename Value="/usr/lib/fpc/src/rtl/objpas/classes/classesh.inc"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="743"/>
-        <CursorPos X="14" Y="763"/>
-        <UsageCount Value="9"/>
+        <TopLine Value="1983"/>
+        <CursorPos X="21" Y="1992"/>
+        <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
         <Filename Value="../units/systemunit.pas"/>
@@ -131,125 +131,105 @@
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit16>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="25" HistoryIndex="24">
       <Position1>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="430" TopLine="428"/>
+        <Filename Value="tools.pas"/>
       </Position1>
       <Position2>
         <Filename Value="tools.pas"/>
-        <Caret Line="36" Column="15" TopLine="22"/>
+        <Caret Line="37" Column="56" TopLine="7"/>
       </Position2>
       <Position3>
         <Filename Value="tools.pas"/>
-        <Caret Line="37" Column="22" TopLine="22"/>
+        <Caret Line="144" Column="16" TopLine="122"/>
       </Position3>
       <Position4>
         <Filename Value="tools.pas"/>
-        <Caret Line="159" Column="15" TopLine="126"/>
+        <Caret Line="147" Column="83" TopLine="129"/>
       </Position4>
       <Position5>
-        <Filename Value="tools.pas"/>
-        <Caret Line="143" Column="53" TopLine="133"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="878" Column="24" TopLine="865"/>
       </Position5>
       <Position6>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="429" Column="56" TopLine="411"/>
+        <Filename Value="tools.pas"/>
+        <Caret Line="141" Column="31" TopLine="133"/>
       </Position6>
       <Position7>
         <Filename Value="tools.pas"/>
-        <Caret Line="18" Column="65" TopLine="18"/>
+        <Caret Line="36" Column="45" TopLine="18"/>
       </Position7>
       <Position8>
         <Filename Value="tools.pas"/>
+        <Caret Line="18" Column="3"/>
       </Position8>
       <Position9>
         <Filename Value="tools.pas"/>
-        <Caret Line="37" Column="56" TopLine="7"/>
+        <Caret Line="37" Column="102" TopLine="36"/>
       </Position9>
       <Position10>
-        <Filename Value="tools.pas"/>
-        <Caret Line="144" Column="16" TopLine="122"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="429" Column="44" TopLine="411"/>
       </Position10>
       <Position11>
-        <Filename Value="tools.pas"/>
-        <Caret Line="147" Column="83" TopLine="129"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="891" Column="3" TopLine="867"/>
       </Position11>
       <Position12>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="878" Column="24" TopLine="865"/>
+        <Caret Line="1004" Column="45" TopLine="987"/>
       </Position12>
       <Position13>
-        <Filename Value="tools.pas"/>
-        <Caret Line="141" Column="31" TopLine="133"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="854" Column="7" TopLine="836"/>
       </Position13>
       <Position14>
-        <Filename Value="tools.pas"/>
-        <Caret Line="36" Column="45" TopLine="18"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="1005" Column="53" TopLine="981"/>
       </Position14>
       <Position15>
-        <Filename Value="tools.pas"/>
-        <Caret Line="18" Column="3"/>
+        <Filename Value="dateibeziehungen.pas"/>
       </Position15>
       <Position16>
-        <Filename Value="tools.pas"/>
-        <Caret Line="37" Column="102" TopLine="36"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="101" Column="33" TopLine="72"/>
       </Position16>
       <Position17>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="429" Column="44" TopLine="411"/>
+        <Caret Line="727" Column="18" TopLine="705"/>
       </Position17>
       <Position18>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="891" Column="3" TopLine="867"/>
+        <Caret Line="1011" Column="38" TopLine="982"/>
       </Position18>
       <Position19>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="1004" Column="45" TopLine="987"/>
+        <Caret Line="727" Column="13" TopLine="708"/>
       </Position19>
       <Position20>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="854" Column="7" TopLine="836"/>
+        <Caret Line="875" Column="22" TopLine="859"/>
       </Position20>
       <Position21>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="1005" Column="53" TopLine="981"/>
+        <Filename Value="tools.pas"/>
+        <Caret Line="54" Column="21" TopLine="37"/>
       </Position21>
       <Position22>
         <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="875" Column="22" TopLine="859"/>
       </Position22>
       <Position23>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="101" Column="33" TopLine="72"/>
+        <Caret Line="717" Column="79" TopLine="693"/>
       </Position23>
       <Position24>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="727" Column="18" TopLine="705"/>
+        <Caret Line="1003" Column="117" TopLine="992"/>
       </Position24>
       <Position25>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="1011" Column="38" TopLine="982"/>
+        <Caret Line="599" TopLine="581"/>
       </Position25>
-      <Position26>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="727" Column="13" TopLine="708"/>
-      </Position26>
-      <Position27>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="875" Column="22" TopLine="859"/>
-      </Position27>
-      <Position28>
-        <Filename Value="tools.pas"/>
-        <Caret Line="54" Column="21" TopLine="37"/>
-      </Position28>
-      <Position29>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="875" Column="22" TopLine="859"/>
-      </Position29>
-      <Position30>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="717" Column="79" TopLine="693"/>
-      </Position30>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/dateibeziehungen.pas b/dateibeziehungen.pas
index ece2e13..d3663e2 100644
--- a/dateibeziehungen.pas
+++ b/dateibeziehungen.pas
@@ -591,17 +591,32 @@ begin
       );
     if quellen[i].count + ziele[i].count > 0 then begin
       // sha512summen erneuern
+
       s:='sed "';
       for j:=0 to quellen[i].count-1 do
         s:=s+'/\s'+escapeStringToRegex(escape(quellen[i][j].name,'$','\'),rtShell,'"/')+'\$/d; ';
-      for j:=0 to ziele[i].count-1 do
-        s:=s+'/\s'+escapeStringToRegex(escape(ziele[i][j].name,'$','\'),rtShell,'"/')+'\$/d; ';
       s:=s+'" -i "'+escape(_pruefSummenDatei,'"\','\')+'"';
-      es.last.befehle.add(s);
+      es.last.befehle.insert(0,s);   // _vorher_ Quellen entfernen ...
+
       s:='sha512sum';
       neuSums.clear;
       for j:=0 to quellen[i].count-1 do
         neuSums.add(quellen[i][j].name);
+      neuSums.sort;
+      neuSums.uniq('-');
+      for j:=0 to neuSums.count-1 do
+        s:=s+' "'+escape(neuSums[j],'"\','\')+'"';
+      s:=s+' >> "'+escape(_pruefSummenDatei,'"\','\')+'"';
+      es.last.befehle.insert(1,s);   // ... und aktualisieren
+
+      s:='sed "';
+      for j:=0 to ziele[i].count-1 do
+        s:=s+'/\s'+escapeStringToRegex(escape(ziele[i][j].name,'$','\'),rtShell,'"/')+'\$/d; ';
+      s:=s+'" -i "'+escape(_pruefSummenDatei,'"\','\')+'"';
+      es.last.befehle.add(s);        // _nachher_ Ziele entfernen ...
+
+      s:='sha512sum';
+      neuSums.clear;
       for j:=0 to ziele[i].count-1 do
         neuSums.add(ziele[i][j].name);
       neuSums.sort;
@@ -609,7 +624,7 @@ begin
       for j:=0 to neuSums.count-1 do
         s:=s+' "'+escape(neuSums[j],'"\','\')+'"';
       s:=s+' >> "'+escape(_pruefSummenDatei,'"\','\')+'"';
-      es.last.befehle.add(s);
+      es.last.befehle.add(s);        // ... und aktualisieren
     end;
   end;
   neuSums.free;