From 4e1c42e429e44999c8f2ab2496e3b26e04c22b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Thu, 7 Mar 2024 20:05:39 +0100 Subject: [PATCH] Try ynh_exec_as --- .vscode/settings.json | 23 ++--------------------- manifest.toml | 1 + scripts/install | 2 +- scripts/upgrade | 4 ++-- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 53478d4..ee4e576 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,23 +1,4 @@ { - "python.autoComplete.extraPaths": [ - "${workspaceFolder}/sources/poky/bitbake/lib", - "${workspaceFolder}/sources/poky/meta/lib" - ], - "python.analysis.extraPaths": [ - "${workspaceFolder}/sources/poky/bitbake/lib", - "${workspaceFolder}/sources/poky/meta/lib" - ], - "[python]": { - "diffEditor.ignoreTrimWhitespace": false, - "gitlens.codeLens.symbolScopes": [ - "!Module" - ], - "editor.formatOnType": true, - "editor.wordBasedSuggestions": "off", - "files.trimTrailingWhitespace": false - }, - "[shellscript]": { - "files.eol": "\n", - "files.trimTrailingWhitespace": false - } + "bashIde.globPattern": "**/*@(.sh|.inc|.bash|.command)|scripts/*|.vscode/helpers/*", + "bashIde.includeAllWorkspaceSymbols": true } diff --git a/manifest.toml b/manifest.toml index 0f7d82f..605b503 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,6 +54,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen url = "https://github.com/jeedom/core/archive/refs/tags/4.1.19.tar.gz" sha256 = "be50f67286d1533c93584f3653d4669b36d649033ad1750342b704f9a824476a" + autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/install b/scripts/install index 0f07f88..6e07f41 100644 --- a/scripts/install +++ b/scripts/install @@ -58,7 +58,7 @@ chown "$app:$app" "$install_dir/core/config/common.config.php" ynh_script_progression --message="Installing Jeedom..." # Install Jeedom -"php$phpversion" "$install_dir/install/install.php" mode=force +ynh_exec_as "$app" "php$phpversion" "$install_dir/install/install.php" mode=force # Configure LDAP and the Admin User and access settings ynh_add_config --template="config.sql" --destination="$install_dir/config.sql" diff --git a/scripts/upgrade b/scripts/upgrade index c3531eb..bb379b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,10 +68,10 @@ chown "$app:$app" "$install_dir/core/config/common.config.php" ynh_script_progression --message="Upgrading Jeedom..." # Upgrade Jeedom -"php$phpversion" "$install_dir/install/install.php" mode=force +ynh_exec_as "$app" "php$phpversion" "$install_dir/install/install.php" mode=force # Check -# "php$phpversion" "$install_dir/install/sick.php" +# ynh_exec_as "$app" "php$phpversion" "$install_dir/install/sick.php" #================================================= # REAPPLY SYSTEM CONFIGURATIONS