Merge branch 'testing' into path

scripts/install

@@ -26,9 +26,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 
 ynh_setup_source --dest_dir="$install_dir"
 
-ynh_add_config --template="../sources/index.md" --destination="$data_dir/src/index.md"
-ynh_add_config --template="../sources/style.css" --destination="$data_dir/src/style.css"
-mv "../sources/_includes" "$data_dir/src/_includes"
+mv -f "../sources/src/" "$data_dir/"
 
 chown -R $app:www-data "$install_dir"
 
@@ -65,8 +63,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npm init -y
-	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH npm install @11ty/eleventy --save-dev
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm init -y
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install @11ty/eleventy --save-dev
 popd
 
 #=================================================

scripts/remove

@@ -29,7 +29,6 @@ ynh_remove_systemd_config
 
 ynh_remove_nginx_config
 
-# Remove NodeJS
 ynh_remove_nodejs
 
 #=================================================

scripts/upgrade

@@ -52,6 +52,21 @@ ynh_add_nginx_config
 env_path="$PATH"
 ynh_add_systemd_config
 
+#=================================================
+# INSTALL ELEVENTY
+#=================================================
+ynh_script_progression --message="Installing $app..." --weight=10
+
+pushd $install_dir
+ 	ynh_use_nodejs
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm init -y
+	ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install @11ty/eleventy --save-dev
+popd
+
+#=================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+
 yunohost service add $app --description="Simpler site generator" --log="/var/log/$app/$app.log"
 
 #=================================================

sources/index.md

@@ -1,6 +0,0 @@
----
-title: Hello world
-layout: "base.njk"
----
-
-This is a mockup page (located here: __DATA_DIR__/src/index.md), please follow the instructions to set up your pages: [https://www.11ty.dev/docs/getting-started/](https://www.11ty.dev/docs/getting-started/)

sources/src/index.md

@@ -0,0 +1,6 @@
+---
+title: Hello world
+layout: "base.njk"
+---
+
+This is a mockup page (located here: /home/yunohost.app/eleventy/src/index.md), please follow the instructions to set up your pages: [https://www.11ty.dev/docs/getting-started/](https://www.11ty.dev/docs/getting-started/)