diff --git a/scripts/_common.sh b/scripts/_common.sh index ba1bc64..aeb6387 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,5 +1,5 @@ # Version numbers -flarum_version="0.1.0-beta.7.1" +flarum_version="0.1.0-beta.7.2" ssowat_ext_ver="0.6" # Execute a command as another user diff --git a/scripts/upgrade b/scripts/upgrade index e66904a..bc3674f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -114,15 +114,21 @@ fi # Downward compatibility: remove the v before version number if [[ $old_flarum_version == "v*" ]]; then $old_flarum_version = ${old_flarum_version:1}; fi # Check if upgrade of Flarum core is needed -if [[ $(dpkg --compare-versions $old_flarum_version lt $flarum_version) ]]; then +if [[ $(dpkg --compare-versions $old_flarum_version lt $flarum_version && echo true) ]]; then # Upgrade Flarum - exec_composer $app $final_path "require -n flarum/core:'$flarum_version'" + exec_composer $app $final_path "require -n flarum/core:$flarum_version" + # Database password has to be input on admin page after upgrade to 0.1.0-beta.7.2 + if [[ $flarum_version == "0.1.0-beta.7.2" ]]; then + curl "https://$domain$path_url/admin" -H "Accept: */*" --compressed -H "Content-Type: application/x-www-form-urlencoded; charset=UTF-8" --data "databasePassword=$db_pwd" -k + fi pushd $final_path exec_as $app php flarum cache:clear popd - ynh_print_info "Flarum has been updated to version $flarum_version." + ynh_print_info "Flarum has been updated to version $flarum_version." + upgraded_flarum=true else ynh_print_info "Flarum does not need updating." + upgraded_flarum=false fi # Check if upgrade of SSOwat extension is needed @@ -133,9 +139,11 @@ if [[ $(dpkg --compare-versions $old_ssowat_ext_ver lt $ssowat_ext_ver && echo t ssowatdomain=$(