diff --git a/manifest.toml b/manifest.toml index 43a39fd..a095012 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Calibre-web" description.en = "Browsing, reading and downloading eBooks using a Calibre database" description.fr = "Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre" -version = "0.6.20~ynh2" +version = "0.96.20~ynh2" maintainers = ["Krakinou"] diff --git a/scripts/install b/scripts/install index 04a4107..f70331b 100755 --- a/scripts/install +++ b/scripts/install @@ -29,9 +29,9 @@ ynh_script_progression --message="Downloading sources to $install_dir..." --weig #REMOVEME? ynh_app_setting_set $app install_dir $install_dir #Set settings constant initializer of the app -ynh_add_config --template="../sources/patches/app-config_sql.py.patch.src" --destination="../sources/patches/app-config_sql.py.patch" -ynh_add_config --template="../sources/patches/app-ub.py.patch.src" --destination="../sources/patches/app-ub.py.patch" -ynh_add_config --template="../sources/patches/app-constants.py.patch.src" --destination="../sources/patches/app-constants.py.patch" +ynh_add_config --template="../sources/patches/main-config_sql.py.patch.src" --destination="../sources/patches/main-config_sql.py.patch" +ynh_add_config --template="../sources/patches/main-ub.py.patch.src" --destination="../sources/patches/main-ub.py.patch" +ynh_add_config --template="../sources/patches/main-constants.py.patch.src" --destination="../sources/patches/main-constants.py.patch" # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" @@ -111,7 +111,7 @@ ynh_add_systemd_config #================================================= # Use logrotate to manage application logfile(s) ynh_use_logrotate --logfile="$log_file" -ynh_use_logrotate --logfile="/var/log/$app/$access_log_file" +ynh_use_logrotate --logfile="$access_log_file" chown -R $app:$app /var/log/$app diff --git a/scripts/remove b/scripts/remove index 981fa96..d33955b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -93,7 +93,8 @@ fi # Remove the log files ynh_script_progression --message="Removing log file..." --weight=1 -ynh_secure_remove "/var/log/$app/" +ynh_secure_remove "$log_file" +ynh_secure_remove "$access_log_file" #================================================= # MESSAGE TO USER diff --git a/scripts/upgrade b/scripts/upgrade index 735a46f..fb4a585 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -90,9 +90,9 @@ then ynh_script_progression --message="Upgrading source files from $current_upstream_app_version to $new_upstream_package_version..." --weight=10 #Set settings constant initializer of the app - ynh_add_config --template="../sources/patches/app-config_sql.py.patch.src" --destination="../sources/patches/app-config_sql.py.patch" - ynh_add_config --template="../sources/patches/app-ub.py.patch.src" --destination="../sources/patches/app-ub.py.patch" - ynh_add_config --template="../sources/patches/app-constants.py.patch.src" --destination="../sources/patches/app-constants.py.patch" + ynh_add_config --template="../sources/patches/main-config_sql.py.patch.src" --destination="../sources/patches/main-config_sql.py.patch" + ynh_add_config --template="../sources/patches/main-ub.py.patch.src" --destination="../sources/patches/main-ub.py.patch" + ynh_add_config --template="../sources/patches/main-constants.py.patch.src" --destination="../sources/patches/main-constants.py.patch" # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" diff --git a/sources/patches/app-admin.html.patch b/sources/patches/main-admin.html.patch similarity index 100% rename from sources/patches/app-admin.html.patch rename to sources/patches/main-admin.html.patch diff --git a/sources/patches/app-config_sql.py.patch.src b/sources/patches/main-config_sql.py.patch.src similarity index 100% rename from sources/patches/app-config_sql.py.patch.src rename to sources/patches/main-config_sql.py.patch.src diff --git a/sources/patches/app-constants.py.patch.src b/sources/patches/main-constants.py.patch.src similarity index 100% rename from sources/patches/app-constants.py.patch.src rename to sources/patches/main-constants.py.patch.src diff --git a/sources/patches/app-optional-requirements.txt.patch b/sources/patches/main-optional-requirements.txt.patch similarity index 100% rename from sources/patches/app-optional-requirements.txt.patch rename to sources/patches/main-optional-requirements.txt.patch diff --git a/sources/patches/app-ub.py.patch.src b/sources/patches/main-ub.py.patch.src similarity index 100% rename from sources/patches/app-ub.py.patch.src rename to sources/patches/main-ub.py.patch.src