plinth/modules/tor/privileged.py

@@ -494,7 +494,5 @@ def uninstall():
     for directory in directories:
         shutil.rmtree(directory, ignore_errors=True)
 
-    defaults_file = f'/var/run/tor-instances/{INSTANCE_NAME}.defaults'
-    pathlib.Path(defaults_file).unlink(missing_ok=True)
-
+    os.unlink(f'/var/run/tor-instances/{INSTANCE_NAME}.defaults')
     action_utils.service_unmask(SERVICE_NAME)

plinth/modules/torproxy/privileged.py

@@ -2,7 +2,7 @@
 """Configure Tor Proxy service."""
 
 import logging
-import pathlib
+import os
 import shutil
 from typing import Any
 
@@ -190,7 +190,5 @@ def uninstall():
     for directory in directories:
         shutil.rmtree(directory, ignore_errors=True)
 
-    defaults_file = f'/var/run/tor-instances/{INSTANCE_NAME}.defaults'
-    pathlib.Path(defaults_file).unlink(missing_ok=True)
-
+    os.unlink(f'/var/run/tor-instances/{INSTANCE_NAME}.defaults')
     action_utils.service_unmask(SERVICE_NAME)

plinth/templates/cards.html

@@ -5,7 +5,6 @@
 
 {% load i18n %}
 {% load static %}
-{% load extras %}
 
 {% block container %}
   <div class="container">
@@ -20,15 +19,6 @@
     {% include "tags.html" %}
   {% endblock %}
 
-  <div class="btn-toolbar container" role="toolbar">
-    <a class="btn btn-primary" href="#available-for-install-container"
-       data-bs-toggle="collapse" role="button" aria-expanded="false"
-       aria-controls="available-for-install-container">
-      {% icon 'plus' %}
-      {% trans "Add new app" %}
-    </a>
-  </div>
-
   <div class="container card-container">
     <div class="row">
       <div class="card-list card-list-primary">
@@ -44,8 +34,8 @@
   </div>
 
   {% if show_disabled %}
-    <div class="container card-container collapse" id="available-for-install-container">
-      <div class="card-section-title">{% trans "Available for install" %}</div>
+    <div class="container card-container">
+      <div class="card-section-title">{% trans "Disabled" %}</div>
       <div class="row">
         <div class="card-list card-list-disabled">
           {% for item in menu_items %}