From d65ef911dee0f227dcd230712d26482b704b44a2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Nov 2021 09:07:35 +0100 Subject: [PATCH] cleaning up --- doc/DESCRIPTION.md | 1 + manifest.json | 9 ++++----- scripts/_common.sh | 24 ++++++++++++++++++++++++ scripts/ynh_detect_arch__2 | 25 ------------------------- 4 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 doc/DESCRIPTION.md delete mode 100644 scripts/ynh_detect_arch__2 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..e7521a0 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Kodi is a media center and entertainment hub that brings all your digital media together. It is 100% free and open source, very customisable and runs on a wide variety of devices. Users can play and view most videos, music, podcasts, games and other digital media files from local and network storage media and the internet. \ No newline at end of file diff --git a/manifest.json b/manifest.json index fe7463d..69636fa 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "kodi", "packaging_format": 1, "description": { - "en": "Transform your YunoHost server into media center with Kodi", - "fr": "Transfromez votre serveur YunoHost en media center avec Kodi" + "en": "Media center that brings all your digital media together", + "fr": "Centre multimédia qui rassemble tous vos médias numériques" }, "version": "17.3~ynh1", "url": "https://kodi.tv", @@ -21,7 +21,7 @@ "url": "blog.cecchettosylvain.fr" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2.3" }, "multi_instance": false, "services": [ @@ -31,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index e5be016..a366e7f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -19,6 +19,30 @@ package_check_dependencies="xserver-xorg-video-dummy" # EXPERIMENTAL HELPERS #================================================= +# Check the architecture +# +# example: architecture=$(ynh_detect_arch) +# +# usage: ynh_detect_arch +# +# Requires YunoHost version 2.2.4 or higher. + +ynh_detect_arch(){ + local architecture + if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then + architecture="arm64" + elif [ -n "$(uname -m | grep 64)" ]; then + architecture="x86-64" + elif [ -n "$(uname -m | grep 86)" ]; then + architecture="i386" + elif [ -n "$(uname -m | grep arm)" ]; then + architecture="arm" + else + architecture="unknown" + fi + echo $architecture +} + #================================================= # FUTURE OFFICIAL HELPERS #================================================= diff --git a/scripts/ynh_detect_arch__2 b/scripts/ynh_detect_arch__2 deleted file mode 100644 index b1c7375..0000000 --- a/scripts/ynh_detect_arch__2 +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Check the architecture -# -# example: architecture=$(ynh_detect_arch) -# -# usage: ynh_detect_arch -# -# Requires YunoHost version 2.2.4 or higher. - -ynh_detect_arch(){ - local architecture - if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then - architecture="arm64" - elif [ -n "$(uname -m | grep 64)" ]; then - architecture="x86-64" - elif [ -n "$(uname -m | grep 86)" ]; then - architecture="i386" - elif [ -n "$(uname -m | grep arm)" ]; then - architecture="arm" - else - architecture="unknown" - fi - echo $architecture -}