mirror of
https://github.com/YunoHost-Apps/minidlna_ynh.git
synced 2024-09-03 19:36:34 +02:00
Corrections mineures
This commit is contained in:
Maniack Crudelis
parent
c787b2d010
commit
aa6150964b
8 changed files with 80 additions and 44 deletions
41
check_process
Normal file
41
check_process
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
;; Test paquet stable
|
||||
auto_remove=1
|
||||
; Manifest
|
||||
version="A. Version of the Debian repositories (recommended)"
|
||||
; Checks
|
||||
pkg_linter=1
|
||||
setup_sub_dir=0
|
||||
setup_root=0
|
||||
setup_nourl=1
|
||||
setup_private=0
|
||||
setup_public=0
|
||||
upgrade=1
|
||||
backup_restore=1
|
||||
multi_instance=0
|
||||
wrong_user=0
|
||||
wrong_path=0
|
||||
incorrect_path=0
|
||||
corrupt_source=0
|
||||
fail_download_source=0
|
||||
port_already_use=1 (48200)
|
||||
final_path_already_use=0
|
||||
;; Test paquet backports
|
||||
auto_remove=1
|
||||
; Manifest
|
||||
version="B. Latest version available for Debian"
|
||||
; Checks
|
||||
setup_sub_dir=0
|
||||
setup_root=0
|
||||
setup_nourl=1
|
||||
setup_private=0
|
||||
setup_public=0
|
||||
upgrade=1
|
||||
backup_restore=0
|
||||
multi_instance=0
|
||||
wrong_user=0
|
||||
wrong_path=0
|
||||
incorrect_path=0
|
||||
corrupt_source=0
|
||||
fail_download_source=0
|
||||
port_already_use=0
|
||||
final_path_already_use=0
|
||||
|
|
@ -1,33 +1,33 @@
|
|||
{
|
||||
"name": "MiniDLNA",
|
||||
"id": "minidlna",
|
||||
"packaging_format": 1,
|
||||
"requirements": {
|
||||
"yunohost": ">= 2.4"
|
||||
},
|
||||
"description": {
|
||||
"en": "Light DLNA server to share media files over the LAN",
|
||||
"fr": "Serveur DLNA léger pour partager les fichiers multimédia sur le réseau local"
|
||||
},
|
||||
"name": "MiniDLNA",
|
||||
"id": "minidlna",
|
||||
"packaging_format": 1,
|
||||
"requirements": {
|
||||
"yunohost": ">= 2.4"
|
||||
},
|
||||
"description": {
|
||||
"en": "Light DLNA server to share media files over the LAN",
|
||||
"fr": "Serveur DLNA léger pour partager les fichiers multimédia sur le réseau local"
|
||||
},
|
||||
"url": "http://minidlna.sourceforge.net/",
|
||||
"licence": "free",
|
||||
"maintainer": {
|
||||
"name": "Maniack Crudelis",
|
||||
"email": "maniackc_dev@crudelis.fr"
|
||||
},
|
||||
"multi_instance": "false",
|
||||
"services": [],
|
||||
"arguments": {
|
||||
"install" : [
|
||||
{
|
||||
"name": "version",
|
||||
"ask": {
|
||||
"en": "Select the minidlna version to install",
|
||||
"fr": "Choix de la version de minidlna à installer"
|
||||
},
|
||||
"license": "free",
|
||||
"maintainer": {
|
||||
"name": "Maniack Crudelis",
|
||||
"email": "maniackc_dev@crudelis.fr"
|
||||
},
|
||||
"multi_instance": false,
|
||||
"services": [],
|
||||
"arguments": {
|
||||
"install" : [
|
||||
{
|
||||
"name": "version",
|
||||
"ask": {
|
||||
"en": "Select the minidlna version to install",
|
||||
"fr": "Choix de la version de minidlna à installer"
|
||||
},
|
||||
"choices": ["A. Version of the Debian repositories (recommended)", "B. Latest version available for Debian"],
|
||||
"default": "A. Version of the Debian repositories (recommended)"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ YNH_VERSION () { # Renvoi le numéro de version de la moulinette Yunohost
|
|||
CHECK_VAR () { # Vérifie que la variable n'est pas vide.
|
||||
# $1 = Variable à vérifier
|
||||
# $2 = Texte à afficher en cas d'erreur
|
||||
test -n "$1" || (echo "$2" && false)
|
||||
test -n "$1" || (echo "$2" >&2 && false)
|
||||
}
|
||||
|
||||
EXIT_PROPERLY () { # Provoque l'arrêt du script en cas d'erreur. Et nettoye les résidus.
|
||||
trap '' ERR
|
||||
echo -e "\e[91m \e[1m" # Shell in light red bold
|
||||
echo -e "!!\n $app install's script has encountered an error. Installation was cancelled.\n!!"
|
||||
echo -e "!!\n $app install's script has encountered an error. Installation was cancelled.\n!!" >&2
|
||||
|
||||
CLEAN_SETUP # Appel la fonction de nettoyage spécifique du script install.
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ TRAP_OFF () { # Ignoring signal capture until TRAP_ON
|
|||
|
||||
CHECK_USER () { # Vérifie la validité de l'user admin
|
||||
# $1 = Variable de l'user admin.
|
||||
sudo yunohost user list --json | grep -q "\"username\": \"$1\"" || (echo "Wrong admin" && false)
|
||||
sudo yunohost user list --json | grep -q "\"username\": \"$1\"" || (echo "Wrong admin" >&2 && false)
|
||||
}
|
||||
|
||||
CHECK_PATH () { # Vérifie la présence du / en début de path. Et son absence à la fin.
|
||||
|
|
@ -60,7 +60,7 @@ CHECK_FINALPATH () { # Vérifie que le dossier de destination n'est pas déjà u
|
|||
final_path=/var/www/$app
|
||||
if [ -e "$final_path" ]
|
||||
then
|
||||
echo "This path already contains a folder"
|
||||
echo "This path already contains a folder" >&2
|
||||
false
|
||||
fi
|
||||
}
|
||||
|
|
@ -81,7 +81,7 @@ SETUP_SOURCE () { # Télécharge la source, décompresse et copie dans $final_pa
|
|||
# $1 = Nom de l'archive téléchargée.
|
||||
wget -nv --show-progress -i ../sources/source_url -O $1
|
||||
# Vérifie la somme de contrôle de la source téléchargée.
|
||||
md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" && false)
|
||||
md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" >&2 && false)
|
||||
# Décompresse la source
|
||||
if [ "$(echo ${1##*.})" == "gz" ]; then
|
||||
tar -x -f $1
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script
|
||||
|
||||
YNH_VERSION # Récupère le numéro de version de Yunohost.
|
||||
|
||||
# Récupère les infos de l'application.
|
||||
ynh_version=$(sudo yunohost -v | grep "moulinette:" | cut -d' ' -f2 | cut -d'.' -f1,2) # Récupère le numéro de version de Yunohost.
|
||||
if [ $ynh_version = "2.4" ]; then
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
else
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ sudo yunohost app setting $app version -v ${version:0:1}
|
|||
sudo yunohost app setting $app port -v $port
|
||||
|
||||
# Création du dossier yunohost.multimedia
|
||||
wget https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip
|
||||
wget -nv https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip
|
||||
unzip master.zip
|
||||
sudo ./yunohost.multimedia-master/script/ynh_media_build.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ if [ -e "/usr/sbin/minidlnad" ] || [ -e "/usr/bin/minidlnad" ]; then
|
|||
sudo apt-get -y purge minidlna
|
||||
fi
|
||||
if [ -e "/etc/apt/sources.list.d/minidlna.list" ]; then
|
||||
echo "Delete apt config"
|
||||
echo "Delete sources.list config"
|
||||
sudo rm "/etc/apt/sources.list.d/minidlna.list"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
source .fonctions # Charge les fonctions génériques habituellement utilisées dans le script
|
||||
|
||||
# Récupère les infos de l'application.
|
||||
YNH_VERSION # Récupère le numéro de version de Yunohost.
|
||||
ynh_version=$(sudo yunohost -v | grep "moulinette:" | cut -d' ' -f2 | cut -d'.' -f1,2) # Récupère le numéro de version de Yunohost.
|
||||
if [ $ynh_version = "2.4" ]; then
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
else
|
||||
|
|
@ -20,7 +18,7 @@ sudo yunohost firewall allow --no-upnp TCP $port > /dev/null 2>&1
|
|||
sudo yunohost firewall allow --no-upnp UDP 1900 > /dev/null 2>&1 # Découverte SSDP pour UPNP.
|
||||
|
||||
# Création du dossier yunohost.multimedia
|
||||
wget https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip
|
||||
wget -nv https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip
|
||||
unzip master.zip
|
||||
sudo ./yunohost.multimedia-master/script/ynh_media_build.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ version=$(sudo yunohost app setting $app version)
|
|||
port=$(sudo yunohost app setting $app port)
|
||||
|
||||
# Mise à jour du dossier yunohost.multimedia
|
||||
wget https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip
|
||||
wget -nv https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip
|
||||
unzip master.zip
|
||||
sudo ./yunohost.multimedia-master/script/ynh_media_build.sh
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue