Zmiana trybu zapisu początkowego, pliku roboczego 'packages_list.html'. Dodanie sygna...

diff --git a/ipr.sh b/ipr.sh
index ca6ca24d1d8289518c60bbd3b30ca99e1fbf76ca..3323bba35cc30bd93110f2637fb8113cede4ad02 100755 (executable)
--- a/ipr.sh
+++ b/ipr.sh
@@ -21,7 +21,8 @@ function checkPackage() {
 }
 
 list=$(awk '{printf $1" "}' list.txt);
-echo "<h2>List pakietów oprogramowania</h2>" >> packages_list.html;
+echo "<h2>List pakietów oprogramowania</h2>" > packages_list.html;
+echo "<p>Stan pakietów i aktualizacji na: <strong>$(date)</strong></p>" >>packages_list.html;
 echo "<table border=\"1\" style=\"border-collapse: collapse\">" >> packages_list.html;
 echo "<tr><th>Nazwa pakietu</th><th>stable</th><th>testing</th><th>LHE*</th></tr>" >> packages_list.html;
 for package in $list; do
@@ -35,9 +36,9 @@ for package in $list; do
   l_veracol=$(checkPackage $package lhe);
   l_version=$(echo $l_veracol | cut -d " " -f 1);
   l_color=$(echo $l_veracol | cut -d " " -f 2);
-       if $(echo "$s_version" | grep -q '^#'); then s_version=""; fi
-  if $(echo "$t_version" | grep -q '^#'); then t_version=""; fi        
-  if $(echo "$l_version" | grep -q '^#'); then l_version=""; fi        
+       if $(echo "$s_version" | grep -q '^#'); then s_version="N/I"; s_color="inherit"; fi
+  if $(echo "$t_version" | grep -q '^#'); then t_version="N/I"; t_color="inherit"; fi  
+  if $(echo "$l_version" | grep -q '^#'); then l_version="N/I"; l_color="inherit"; fi  
        #if [ "$package" = "linux-image-amd64" ] || [ "$package" = "linux-image-686" ]; then package="linux-image"; fi;
        echo "<td>${package}</td>" >> packages_list.html;
        echo "<td><span style=\"color: ${s_color}\">${s_version}</span></td>" >> packages_list.html;
@@ -46,8 +47,13 @@ for package in $list; do
        echo "</tr>" >> packages_list.html;
 done
 echo "</table>" >> packages_list.html;
-echo "<p>";
-echo "<em>* - Low Hardware Edition, Debian 10 Buster, 32-bit</em><br />";
-echo "<span style=\"display: block; width: 15px; height: 10px; background-color: #15ed15\"></span> - zainstalowana wersja<br />"; 
-echo "<span style=\"display: block; width: 15px; height: 10px; background-color: #ff0000\"></span> - wersja gotowa do instalacji (aktualizacja)<br />";
-echo "</p>";
+echo "<p>" >> packages_list.html;
+echo "<em>* - Low Hardware Edition, Debian 10 Buster, 32-bit</em><br />" >> packages_list.html;
+echo "<strong>N/I</strong> - (ang. <em>Not installed</em>) - nie zainstalowano<br />" >> packages_list.html;
+echo "<span style=\"display: block; width: 15px; height: 15px; background-color: #15ed15; float: left;\"></span>&nbsp;- zainstalowana wersja<br />" >> packages_list.html; 
+echo "<span style=\"display: block; width: 15px; height: 15px; background-color: #ff0000; float: left;\"></span>&nbsp;- wersja gotowa do instalacji (aktualizacja)<br />" >> packages_list.html;
+echo "</p>" >> packages_list.html;
+sed -n '1,21p' template.html > lista_oprogramowania_immudex.html;
+cat packages_list.html >> lista_oprogramowania_immudex.html;
+sed -n '21,$p' template.html >> lista_oprogramowania_immudex.html;
+sudo cp lista_oprogramowania_immudex.html /var/www/html;