Merge branch 'main' of https://git.xpub.nl/vitrinekast/tl-dr

print.css

@@ -42,8 +42,12 @@ mark {
   display: block;
   padding-left: 0.5cm;
   font-family: "DuctusRegular";
+<<<<<<< HEAD
   margin-bottom: 1cm;
   margin-right: 1cm;
+=======
+  white-space: normal;
+>>>>>>> f838a40ff28785f7358a6f3abf37b3cf89ad0d25
 }
 
 h1,

script.py

@@ -44,10 +44,11 @@ time_since_last_boot = now - slb_date
 
 dpkg_date = now.strftime("%Y-%m-%d")
 
-list_package_installs = subprocess.run(["grep","-E", '${dpkg_date}.*install|install.*${dpkg_date}', "/var/log/dpkg.log"], capture_output=True).stdout.decode('UTF-8').splitlines()
-list_package_upgrade = subprocess.run(["grep","-E", '${dpkg_date}.*upgrade|upgrade.*${dpkg_date}', "/var/log/dpkg.log"], capture_output=True).stdout.decode('UTF-8').splitlines()
-list_package_remove = subprocess.run(["grep","-E", '${dpkg_date}.*remove|remove.*${dpkg_date}', "/var/log/dpkg.log"], capture_output=True).stdout.decode('UTF-8').splitlines()
+list_package_installs = subprocess.run(["grep","-E", dpkg_date + '.*install|install.*' + dpkg_date, "/var/log/dpkg.log"], capture_output=True).stdout.decode('UTF-8').splitlines()
 
+list_package_upgrade = subprocess.run(["grep","-E", dpkg_date + '.*upgrade|upgrade.*' + dpkg_date, "/var/log/dpkg.log"], capture_output=True).stdout.decode('UTF-8').splitlines()
+
+list_package_remove = subprocess.run(["grep","-E", dpkg_date + '.*remove|remove.*' + dpkg_date, "/var/log/dpkg.log"], capture_output=True).stdout.decode('UTF-8').splitlines()
 
 device_info_grab = subprocess.run(["grep", 'Model' , "/proc/cpuinfo"], check=True, capture_output=True)
 device_info = run_command(['awk', '-F:', '{ print $2}'], based=device_info_grab.stdout)

templates/book.jinja

@@ -70,16 +70,19 @@
     {% endif %}
 
     <pre><em>tldr@chopchop:~ $</em>sudo journalctl -S today _COMM=useradd -r</pre>
-        <mark>
+    <mark>
         Users are assigned to groups, which allow them rights to read or edit files, run commands or apply infrastructural changes. For chopchop, we all have 'sudo rights': the ability to perform any command, including the more sensitive ones. Sudo is a command that's short for 'superuser do', with it, a user has more privileges, like installing or updating a package or performing a restart.
-        </mark>
+    </mark>
+      
     {% if users_created_today is defined %}
         <mark>
-      {% if users_created_today|length > 0 %}{{last_user_name}} user was added, and the network of trust grew ever so slightly. Users will be trusted with not just the keys and passwords to the "house" which is the server, but with a
-      portion of responsibility to keep it afloat and contribute to what makes it a community of practices (and
-      network of knowledge and dependence).{% else %}No new users were created today. The trust network remains the same size.{% endif %}
+      {% if users_created_today|length > 0 %}
+            {{last_user_name}} user was added, and the network of trust grew ever so slightly. Users will be trusted with not just the keys and passwords to the "house" which is the server, but with a portion of responsibility to keep it afloat and contribute to what makes it a community of practices (and network of knowledge and dependence).
+    {% else 
+            No new users were created today. The trust network remains the same size.
+    {% endif %}
         </mark>
-        {% endif %}
+    {% endif %}
 
       {% if list_package_installs|length > 0 %}
     <pre><em>tldr@chopchop:~ $</em> grep 'install' /var/log/dpkg.log</pre>