diff --git a/README.md b/README.md index bbe826a..0769a72 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -47,4 +47,4 @@ or sudo yunohost app upgrade cachet -u https://github.com/YunoHost-Apps/cachet_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 3341968..68d6c40 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ diff --git a/manifest.toml b/manifest.toml index 511c5b8..ee5f120 100644 --- a/manifest.toml +++ b/manifest.toml @@ -69,12 +69,12 @@ ram.runtime = "50M" [resources.apt] packages = [ "mariadb-server", - "php8.2", - "php8.2-gd", - "php8.2-mbstring", - "php8.2-xml", - "php8.2-mysql", - "php8.2-sqlite3" + "php7.4", + "php7.4-gd", + "php7.4-mbstring", + "php7.4-xml", + "php7.4-mysql", + "php7.4-sqlite3" ] [resources.database] diff --git a/scripts/install b/scripts/install index 3027206..81c8865 100644 --- a/scripts/install +++ b/scripts/install @@ -71,7 +71,7 @@ password_hash="$(cd $install_dir ; php$phpversion artisan tinker -q --no-ansi password_pash="${password_hash::-1}" # Remove last character # Populate MySQL database -ynh_add_config --template="../conf/init-mysql.sql" --destination="$install_dir/init-mysql.sql" +ynh_add_config --template="init-mysql.sql" --destination="$install_dir/init-mysql.sql" ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < "$install_dir/init-mysql.sql" ynh_delete_file_checksum --file="$install_dir/init-mysql.sql" #REMOVEME? ynh_secure_remove --file="$install_dir/init-mysql.sql" diff --git a/scripts/upgrade b/scripts/upgrade index 4df9deb..cf7b033 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # SET MAINTENANCE MODE ON #================================================= @@ -25,14 +19,9 @@ exec_artisan "down" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".env bootstrap/cachet/production.php" -fi +ynh_setup_source --dest_dir="$install_dir" --keep=".env bootstrap/cachet/production.php" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"