1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/flarum_ynh.git synced 2024-09-03 18:36:24 +02:00

Merge pull request #103 from YunoHost-Apps/fix-extensions

[fix] Install extensions
This commit is contained in:
tituspijean 2018-09-14 00:27:50 +02:00 committed by GitHub
commit e49df2cf20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View file

@ -1,6 +1,6 @@
# Version numbers
flarum_version="0.1.0-beta.7.1"
ssowat_ext_ver="0.5"
ssowat_ext_ver="0.6"
# Execute a command as another user
# usage: exec_as USER COMMAND [ARG ...]

View file

@ -226,9 +226,9 @@ case $language in
sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'"
ynh_mysql_execute_as_root "$sql_command" $db_name
;;
esac
esac
if [[ $bazaar_extension ]]; then
if [ $bazaar_extension -eq 1 ]; then
exec_composer $app $final_path "require flagrow/bazaar --ansi"
fi

View file

@ -125,7 +125,7 @@ else
fi
# Check if upgrade of SSOwat extension is needed
if [[ $(dpkg --compare-versions $old_ssowat_ext_ver lt $ssowat_ext_ver) ]] || [ -z $old_ssowat_ext_ver] ; then
if [[ $(dpkg --compare-versions $old_ssowat_ext_ver lt $ssowat_ext_ver && echo true) || -z $old_ssowat_ext_ver ]]; then
# Install and activate the SSOwat auth extension
install_and_activate_extension $app $final_path $db_name "tituspijean/flarum-ext-auth-ssowat:$ssowat_ext_ver" "tituspijean-auth-ssowat"
# Configure SSOwat auth extension
@ -134,7 +134,7 @@ if [[ $(dpkg --compare-versions $old_ssowat_ext_ver lt $ssowat_ext_ver) ]] || [
ynh_mysql_execute_as_root "$sql_command" $db_name
fi
if [[ $bazaar_extension ]]; then
if [ $bazaar_extension -eq 1 ]; then
install_and_activate_extension $app $final_path $db_name "flagrow/bazaar" "flagrow-bazaar"
fi