Changeset 410 for trunk

Timestamp:

Jan 27, 2020, 2:25:56 PM (4 years ago)

Author:

g7moreau

Message:

• Try to push old version of the klask switch map

Location:

trunk

Files:

• klask (modified) (1 diff)
• push-web (modified) (5 diffs)

trunk/klask

@@ -14 +14 @@
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.7.11');
+use version; our $VERSION = version->declare('0.7.12');
 
 use Readonly;

trunk/push-web

@@ -48 +48 @@
 
 klask exportsw --format dot --modulo ${GRAPH_MODULO} --shift ${GRAPH_SHIFT} > ${TMP}/switch-map.txt.new
-
+klask exportsw                                                              > ${TMP}/switch-db.txt.new
 
 klask exportdb    > ${TMP}/hostname-db.txt
-klask exportsw    > ${TMP}/switch-db.txt
 klask ip-free     > ${TMP}/ipfree-db.txt
 klask bad-vlan-id > ${TMP}/badvlan-db.txt
 
+cmp --silent ${TMP}/switch-db.txt.new ${TMP}/switch-db.txt || {
+   mv -f ${TMP}/switch-db.txt.new ${TMP}/switch-db.${TIMEFILE}.txt;
+   ln -sf ${TMP}/switch-db.${TIMEFILE}.txt ${TMP}/switch-db.txt
+   }
+
+cmp --silent ${TMP}/switch-map.txt.new ${TMP}/switch-map.txt || {
+   mv -f ${TMP}/switch-map.txt.new ${TMP}/switch-map.${TIMEFILE}.txt;
+   ln -sf ${TMP}/switch-map.${TIMEFILE}.txt ${TMP}/switch-map.txt
+   }
+
+old_switch_db=$((echo 'command <tt>klask exportsw --format txt</tt>';
+      (cd ${TMP}/; ls -1 switch-db.20[[0-9]][[0-9]]-[[0-9]][[0-9]]-[[0-9]][[0-9]].[[0-9]][[0-9]]-[[0-9]][[0-9]].txt;) \
+      | sed -e 's/^switch-db\.//; s/\.txt$//;' \
+      | xargs -r -I {} printf "<a href=\"switch-db.%s.txt\">%s</a>\n" '{}' '{}' \
+      ) \
+   | paste -sd ',' -)
+
+old_switch_map=$((echo 'graphviz';\
+      (cd ${TMP}/; ls -1 switch-map.20[[0-9]][[0-9]]-[[0-9]][[0-9]]-[[0-9]][[0-9]].[[0-9]][[0-9]]-[[0-9]][[0-9]].txt;) \
+      | sed -e 's/^switch-map\.//; s/\.txt$//;' \
+      | xargs -r -I {} printf "<a href=\"switch-map.%s.txt\">%s</a>\n" '{}' '{}' \
+      )\
+   | paste -sd ',' -)
 
 cat <<END > ${TMP}/index.html
@@ -237 +259 @@
    <ul>
     <li><a href="hostname-db.txt">Computers DB</a> (command <tt>klask exportdb --format txt</tt>),</li>
-    <li><a href="switch-db.txt">Switches DB</a> (command <tt>klask exportsw --format txt</tt>),</li>
+    <li><a href="switch-db.txt">Switches DB</a> (${old_switch_db}),</li>
     <li><a href="ipfree-db.txt">IP available</a> (command <tt>klask ip-free --format txt</tt>),</li>
     <li><a href="badvlan-db.txt">VLAN mismatch</a> (command <tt>klask bad-vlan-id --format txt</tt>),</li>
-    <li>Map format: <a href="switch-map.txt">dot source</a> (graphviz), <a href="switch-map.png">png</a>, <a href="switch-map.svg">svg</a>.</li>
+    <li>Map format: <a href="switch-map.txt">dot source</a> (${old_switch_map}), <a href="switch-map.png">png</a>, <a href="switch-map.svg">svg</a>.</li>
    </ul>
   </p>
@@ -254 +276 @@
 </html>
 END
-
-cmp --silent ${TMP}/switch-map.txt.new ${TMP}/switch-map.txt || {
-   mv -f ${TMP}/switch-map.txt.new ${TMP}/switch-map.${TIMEFILE}.txt;
-   ln -sf ${TMP}/switch-map.${TIMEFILE}.txt ${TMP}/switch-map.txt
-   }
 
 if [ "${REMOTE_SERVER}" = "localhost" ]
@@ -269 +286 @@
       ${TMP}/*-db.txt \
       ${TMP}/switch-map.txt \
+      ${TMP}/*.20[[0-9]][[0-9]]-[[0-9]][[0-9]]-[[0-9]][[0-9]].[[0-9]][[0-9]]-[[0-9]][[0-9]].txt \
       ${REMOTE_FOLDER}/
 
@@ -283 +301 @@
       ${TMP}/*-db.txt \
       ${TMP}/switch-map.txt \
+      ${TMP}/*.20[[0-9]][[0-9]]-[[0-9]][[0-9]]-[[0-9]][[0-9]].[[0-9]][[0-9]]-[[0-9]][[0-9]].txt \
       ${REMOTE_USER}@${REMOTE_SERVER}:${REMOTE_FOLDER}/