diff --git a/README.md b/README.md index 0591807..af9c89b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files. It allows the creation of multiple users and each user can have its own directory. It can be used as a standalone app or as a middleware. -**Shipped version:** 2.23.0~ynh4 +**Shipped version:** 2.23.0~ynh5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6fec4a6..ecbbc5b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files. It allows the creation of multiple users and each user can have its own directory. It can be used as a standalone app or as a middleware. -**Version incluse :** 2.23.0~ynh4 +**Version incluse :** 2.23.0~ynh5 ## Captures d’écran diff --git a/conf/amd64.src b/conf/amd64.src deleted file mode 100644 index 2f5770e..0000000 --- a/conf/amd64.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-amd64-filebrowser.tar.gz -SOURCE_SUM=87dfa8c34918951c4ea2f35c77106b9d4cbd5751774271ec26f70107bc4ca275 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= diff --git a/conf/arm64.src b/conf/arm64.src deleted file mode 100644 index caaaf56..0000000 --- a/conf/arm64.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-arm64-filebrowser.tar.gz -SOURCE_SUM=2567cde3cffc1a62e28bf025adcc2607f558248cfe71a6e6bfe690027eebff89 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= diff --git a/conf/armhf.src b/conf/armhf.src deleted file mode 100644 index 25eff31..0000000 --- a/conf/armhf.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-armv7-filebrowser.tar.gz -SOURCE_SUM=4c38b372d4489c4180db34a02019022ee2e73fb172365aaba87f12e8ce78a769 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= diff --git a/conf/i386.src b/conf/i386.src deleted file mode 100644 index 47f6a63..0000000 --- a/conf/i386.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-386-filebrowser.tar.gz -SOURCE_SUM=96b4c090448e69279d45c922840cbb5fc7499a834df961becf0a2e29a9cb7159 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= diff --git a/manifest.toml b/manifest.toml index 796f604..f4dc70f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Filebrowser" description.en = "Web File Browser" description.fr = "Gestionnaire de fichiers" -version = "2.23.0~ynh4" +version = "2.23.0~ynh5" maintainers = ["eric_G"] @@ -16,7 +16,7 @@ admindoc = "https://filebrowser.org/" code = "https://github.com/filebrowser/filebrowser" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.17" architectures = "all" multi_instance = true ldap = "not_relevant" @@ -38,6 +38,26 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + in_subdir = false + amd64.url = "https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-amd64-filebrowser.tar.gz" + amd64.sha256 = "87dfa8c34918951c4ea2f35c77106b9d4cbd5751774271ec26f70107bc4ca275" + arm64.url = "https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-arm64-filebrowser.tar.gz" + arm64.sha256 = "2567cde3cffc1a62e28bf025adcc2607f558248cfe71a6e6bfe690027eebff89" + i386.url = "https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-386-filebrowser.tar.gz" + i386.sha256 = "96b4c090448e69279d45c922840cbb5fc7499a834df961becf0a2e29a9cb7159" + armhf.url = "https://github.com/filebrowser/filebrowser/releases/download/v2.23.0/linux-armv7-filebrowser.tar.gz" + armhf.sha256 = "4c38b372d4489c4180db34a02019022ee2e73fb172365aaba87f12e8ce78a769" + + autoupdate.strategy = "latest_github_release" + autoupdate.asset.amd64 = "^linux-amd64-filebrowser.tar.gz$" + autoupdate.asset.arm64 = "^linux-arm64-filebrowser.tar.gz$" + autoupdate.asset.i386 = "^linux-386-filebrowser.tar.gz$" + autoupdate.asset.armhf = "^linux-armv7-filebrowser.tar.gz$" + [resources.ports] [resources.system_user] diff --git a/scripts/install b/scripts/install index ad841cc..5e56704 100755 --- a/scripts/install +++ b/scripts/install @@ -15,11 +15,10 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Setting up source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH +ynh_setup_source --dest_dir="$install_dir" touch $install_dir/database.db -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod -R +x "$install_dir/filebrowser" diff --git a/scripts/restore b/scripts/restore index 2b2065d..6c61498 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod -R +x "$install_dir/filebrowser" diff --git a/scripts/upgrade b/scripts/upgrade index 5fc455f..589d3b9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,10 +33,9 @@ then ynh_script_progression --message="Upgrading source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH --keep="settings.json" + ynh_setup_source --dest_dir="$install_dir" --keep="settings.json" fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod -R +x "$install_dir/filebrowser" diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/extra_files/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/patches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op]