diff --git a/manifest.toml b/manifest.toml index 2aeb8d0..95eb91a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "facilmap" @@ -80,7 +82,7 @@ ram.runtime = "50M" [resources] [resources.ports] - + [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index 33450a6..c287938 100755 --- a/scripts/install +++ b/scripts/install @@ -42,7 +42,7 @@ mkdir -p $install_dir chown -R $app $install_dir pushd $install_dir - ynh_exec_as $app "$ynh_node_load_PATH" $ynh_npm install --prefix "$install_dir" -g facilmap-server@"$facilmap_version" 2>/dev/null + ynh_exec_as $app "$ynh_node_load_PATH" $ynh_npm install --prefix "$install_dir" -g facilmap-server@"$facilmap_version" 2>/dev/null popd chmod 750 "$install_dir" diff --git a/scripts/remove b/scripts/remove index 756ab14..7ddeaab 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,8 +18,8 @@ source /usr/share/yunohost/helpers # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --weight=2 - yunohost service remove $app + ynh_script_progression --message="Removing $app service integration..." --weight=2 + yunohost service remove $app fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e2a4d9b..5fdcfe5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,10 +43,10 @@ ynh_script_progression --message="Install $app..." --weight=20 if [ "$upgrade_type" == "UPGRADE_APP" ] then - chown -R $app $install_dir - pushd $install_dir - ynh_exec_as $app "$ynh_node_load_PATH" $ynh_npm install --prefix "$install_dir" -g facilmap-server@"$facilmap_version" 2>/dev/null - popd + chown -R $app $install_dir + pushd $install_dir + ynh_exec_as $app "$ynh_node_load_PATH" $ynh_npm install --prefix "$install_dir" -g facilmap-server@"$facilmap_version" 2>/dev/null + popd fi #================================================= diff --git a/tests.toml b/tests.toml index 34bf05c..0887ae5 100644 --- a/tests.toml +++ b/tests.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json + test_format = 1.0 [default] @@ -6,8 +8,8 @@ test_format = 1.0 # Default args to use for install # ------------------------------- - args.ors_token = "test" - args.mapbox_token = "test" - args.maxmind_user_id = "" - args.maxmind_license_key = "" - args.user_agent = "FacilMap (https://facilmap.org/, webmaster@example.org)" \ No newline at end of file + args.ors_token = "test" + args.mapbox_token = "test" + args.maxmind_user_id = "" + args.maxmind_license_key = "" + args.user_agent = "FacilMap (https://facilmap.org/, webmaster@example.org)"