1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ttrss_ynh.git synced 2024-10-01 13:34:46 +02:00

Merge pull request #85 from YunoHost-Apps/testing

Specify the php version
This commit is contained in:
Kayou 2020-09-15 16:27:23 +02:00 committed by GitHub
commit 48aa843955
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions

View file

@ -6,7 +6,7 @@
"en": "News feed (RSS/Atom) reader and aggregator.", "en": "News feed (RSS/Atom) reader and aggregator.",
"fr": "Lecteur de flux dactualité utilisant les protocoles RSS et Atom." "fr": "Lecteur de flux dactualité utilisant les protocoles RSS et Atom."
}, },
"version": "20200906~ynh1", "version": "20200906~ynh2",
"url": "http://tt-rss.org", "url": "http://tt-rss.org",
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"maintainer": { "maintainer": {

View file

@ -91,6 +91,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
# SPECIFIC SETUP # SPECIFIC SETUP
@ -132,7 +133,7 @@ ynh_script_progression --message="Initializing database..." --weight=6
ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \
< "$final_path/schema/ttrss_schema_mysql.sql" < "$final_path/schema/ttrss_schema_mysql.sql"
ynh_exec_as $app php ${final_path}/update.php --update-schema ynh_exec_as $app php"${phpversion}" ${final_path}/update.php --update-schema
#================================================= #=================================================
# START TTRSS IN BACKGROUND # START TTRSS IN BACKGROUND

View file

@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
# CHECK VERSION # CHECK VERSION
@ -152,7 +153,7 @@ then
ynh_script_progression --message="Upgrading ttrss database..." --weight=2 ynh_script_progression --message="Upgrading ttrss database..." --weight=2
chown -R $app: $final_path chown -R $app: $final_path
ynh_exec_as $app php ${final_path}/update.php --update-schema ynh_exec_as $app php"${phpversion}" ${final_path}/update.php --update-schema
fi fi
#================================================= #=================================================