From 9bf49e7ad00ff4f41a67f0395545c9e0ddbdd0d4 Mon Sep 17 00:00:00 2001
From: Florent <florent.git@zeteo.me>
Date: Thu, 5 Jan 2023 17:38:27 +0100
Subject: [PATCH] Fix manifest, detect when in LXC and bump to new version

---
 manifest.json      |  3 ++-
 scripts/_common.sh |  9 +--------
 scripts/install    |  2 +-
 scripts/remove     | 10 +---------
 scripts/restore    |  2 +-
 scripts/upgrade    |  2 +-
 6 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/manifest.json b/manifest.json
index 41f5a51..d63783b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Distributed and RESTful search engine.",
         "fr": "Moteur de recherche RESTful."
     },
-    "version": "7.17.8~ynh1",
+    "version": "7.17.8~ynh2",
     "url": "https://github.com/elastic/elasticsearch",
     "upstream": {
         "license": "SSPL-1.0",
@@ -23,6 +23,7 @@
     "requirements": {
         "yunohost": ">= 11.0.0"
     },
+    "services": [],
     "multi_instance": true,
     "arguments": {
         "install": []
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2c37081..944a65e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,14 +7,7 @@
 #=================================================
 # PERSONAL HELPERS
 #=================================================
-IS_PACKAGE_CHECK () {
-	if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
+
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 481e738..dfb0fca 100755
--- a/scripts/install
+++ b/scripts/install
@@ -116,7 +116,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..."
 # Increase the maximum number of files inotify can monitor.
 cp -a ../conf/90-max_map_count-elasticsearch.conf /etc/sysctl.d/
 # Then, reload the kernel configuration.
-if ! IS_PACKAGE_CHECK   # LXC doesn't allow sysctl to play with kernel options.
+if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options.
 then
 	sysctl -p /etc/sysctl.d/90-max_map_count-elasticsearch.conf
 fi
diff --git a/scripts/remove b/scripts/remove
index 86adf51..d38411c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -75,14 +75,6 @@ fi
 ynh_script_progression --message="Removing pid directory..." --weight=1
 ynh_secure_remove --file="/run/$app"
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
 #=================================================
 # CLOSE A PORT
 #=================================================
@@ -113,7 +105,7 @@ ynh_script_progression --message="Removing various files..."
 if [ -e "/etc/sysctl.d/90-max_map_count-elasticsearch.conf" ]; then
 	ynh_secure_remove --file="/etc/sysctl.d/90-max_map_count-elasticsearch.conf"
 	# Reload the kernel configuration.
-	if ! IS_PACKAGE_CHECK   # LXC doesn't allow sysctl to play with kernel options.
+	if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options.
 	then
 		sysctl --system
 	fi
diff --git a/scripts/restore b/scripts/restore
index b765085..e9359ab 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -91,7 +91,7 @@ chown $app:$app "/run/$app"
 ynh_script_progression --message="Restoring various files..."
 
 ynh_restore_file --origin_path="/etc/sysctl.d/90-max_map_count-elasticsearch.conf"
-if ! IS_PACKAGE_CHECK   # LXC doesn't allow sysctl to play with kernel options.
+if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options.
 then
 	sysctl -p /etc/sysctl.d/90-max_map_count-elasticsearch.conf
 fi
diff --git a/scripts/upgrade b/scripts/upgrade
index 19def57..5c8e10f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -99,7 +99,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..."
 # Increase the maximum number of files inotify can monitor.
 cp -a ../conf/90-max_map_count-elasticsearch.conf /etc/sysctl.d/
 # Then, reload the kernel configuration.
-if ! IS_PACKAGE_CHECK   # LXC doesn't allow sysctl to play with kernel options.
+if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options.
 then
 	sysctl -p /etc/sysctl.d/90-max_map_count-elasticsearch.conf
 fi