Merge pull request #142 from yunohost-bot/delete-log-removal

[autopatch] Do not delete logs on app removal

manifest.toml

@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
 packaging_format = 2
 
 id = "calibreweb"

scripts/remove

@@ -91,7 +91,6 @@ if [ -z /etc/ImageMagick-6/policy.xml ]; then
 			--target_file="/etc/ImageMagick-6/policy.xml"
 fi
 
-# Remove the log files
 ynh_script_progression --message="Removing log file..." --weight=1
 ynh_secure_remove "$log_file"
 ynh_secure_remove "$access_log_file"

scripts/restore

@@ -51,13 +51,14 @@ chown -R "$app:" "$install_dir"
 
 #run source in a 'sub shell'
 (
+	cd "$install_dir"
 	set +o nounset
-	source "${install_dir}/venv/bin/activate"
+	source "venv/bin/activate"
 	set -o nounset
-	ynh_exec_as $app $install_dir/venv/bin/python3 -m ensurepip
-	ynh_exec_as $app $install_dir/venv/bin/pip3 install --upgrade wheel pip setuptools
-	ynh_exec_as $app $install_dir/venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/requirements.txt"
-	ynh_exec_as $app $install_dir/venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/optional-requirements.txt"
+	ynh_exec_as $app venv/bin/python3 -m ensurepip
+	ynh_exec_as $app venv/bin/pip3 install --upgrade wheel pip setuptools
+	ynh_exec_as $app venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/requirements.txt"
+	ynh_exec_as $app venv/bin/pip3 install --no-cache-dir --upgrade -r "$install_dir/optional-requirements.txt"
 )
 
 #=================================================
@@ -167,4 +168,3 @@ ynh_script_progression --message="Restoration completed for $app" --last
 # WARNING FOR READ ACCESS
 #=================================================
 ynh_print_warn "Please, give required access to $app user to the $calibre_dir folder."
-

tests.toml

@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
 test_format = 1.0
 
 [default]