From 1a0b1cc8dd07c6ead6f0399a2d07c3d1b80fce68 Mon Sep 17 00:00:00 2001
From: Kayou <pierre@kayou.io>
Date: Tue, 6 Feb 2024 20:54:56 +0100
Subject: [PATCH] Apply suggestions from code review

---
 manifest.toml      | 21 +++++++--------------
 scripts/_common.sh | 18 ++----------------
 scripts/restore    |  2 +-
 scripts/upgrade    |  2 +-
 4 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 4dc1fb1..24a7a9d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -56,15 +56,17 @@ ram.runtime = "500M"
 
     [resources.apt]
     packages = [
+        # According to https://documentation.ubuntu.com/lxd/en/latest/installing/#install-lxd-from-source
         "acl",
         "attr",
         "autoconf",
+        "automake",
         "dnsmasq-base",
         "git",
         "libacl1-dev",
         "libcap-dev",
         "liblxc1",
-        "lxc-dev",
+        "liblxc-dev",
         "libsqlite3-dev",
         "libtool",
         "libudev-dev",
@@ -78,20 +80,11 @@ ram.runtime = "500M"
         "tcl",
         "xz-utils",
         "ebtables",
-        "libapparmor-dev",
-        "libseccomp-dev",
-        "libcap-dev",
+
+        # For lvm2
         "lvm2",
         "thin-provisioning-tools",
-        "btrfs-progs",
-        "busybox",
-        "libattr1-dev",
-        "libuv1",
-        "libdevmapper-event1.02.1",
-        "dmeventd",
-        "lxc",
-        "tcl8.6",
 
-        # For debuging
-        "iproute2",
+        # For btrfs
+        "btrfs-progs"
     ]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 27d3ae3..7cee4c8 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -94,14 +94,7 @@ ynh_remove_systemd_socket_config () {
 }
 
 _ynh_add_dnsmasq() {
-    # Declare an array to define the options of this helper.
-    local legacy_args=t
-    local -A args_array=( [t]=template= )
-    local template
-    ynh_handle_getopts_args "$@"
-    local template="${template:-dnsmasq.conf}"
-
-    ynh_add_config --template="$template" --destination="/etc/dnsmasq.d/$app"
+    ynh_add_config --template="dnsmasq.conf" --destination="/etc/dnsmasq.d/$app"
 
     ynh_systemd_action --service_name=dnsmasq --action=restart
 }
@@ -113,14 +106,7 @@ _ynh_remove_dnsmasq() {
 }
 
 _ynh_add_ld_so() {
-    # Declare an array to define the options of this helper.
-    local legacy_args=t
-    local -A args_array=( [t]=template= )
-    local template
-    ynh_handle_getopts_args "$@"
-    local template="${template:-ld.so.conf}"
-
-    ynh_add_config --template="$template" --destination="/etc/ld.so.conf.d/$app.conf"
+    ynh_add_config --template="ld.so.conf" --destination="/etc/ld.so.conf.d/$app.conf"
 
     ldconfig
 }
diff --git a/scripts/restore b/scripts/restore
index 59bb2eb..cb917d4 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -32,7 +32,7 @@ ynh_restore_file --origin_path="/etc/bash_completion.d/lxd-client"
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
+ynh_script_progression --message="Restoring system configurations related to $app..."
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 ynh_restore_file --origin_path="/etc/systemd/system/$app.socket"
diff --git a/scripts/upgrade b/scripts/upgrade
index a493a9a..86ae56c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,7 +22,7 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$a
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
+ynh_script_progression --message="Ensuring downward compatibility..."
 
 # Remove old file
 if [ -f "/usr/local/bin/lxd-p2c" ]; then