YunoHost-Apps/kodi_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/kodi_ynh.git synced 2024-09-03 19:26:34 +02:00
Code Issues Activity Actions

Merge branch 'Jibec-master' into testing

Browse source
This commit is contained in:
Gredin 67 2021-01-23 21:58:12 +01:00
commit a0f54a0b83
5 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Transform your YunoHost server into media center with Kodi", "en": "Transform your YunoHost server into media center with Kodi",
"fr": "Transfromez votre serveur YunoHost en media center avec Kodi" "fr": "Transfromez votre serveur YunoHost en media center avec Kodi"
}, },
"version": "17.3", "version": "17.3~ynh1",
"url": "https://kodi.tv", "url": "https://kodi.tv",
"license": "GPL-2.0", "license": "GPL-2.0",
"maintainer": { "maintainer": {
@ -15,7 +15,7 @@
"url": "blog.cecchettosylvain.fr" "url": "blog.cecchettosylvain.fr"
}, },
"requirements": { "requirements": {
"yunohost": ">= 2.6.4" "yunohost": ">= 2.7.12"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [

29
scripts/install
View file

@ -58,9 +58,9 @@ ynh_app_setting_set "$app" open_webserver_port "$open_webserver_port"
# CREATE KODI USER # CREATE KODI USER
#================================================= #=================================================
ynh_system_user_create "$app" "$final_path" ynh_system_user_create "$app" "$final_path"
sudo mkdir "$final_path" mkdir "$final_path"
sudo chown -R "$app":"$app" "$final_path" chown -R "$app":"$app" "$final_path"
sudo usermod -a -G cdrom,audio,video,plugdev,users,dialout,dip,input,netdev "$app" usermod -a -G cdrom,audio,video,plugdev,users,dialout,dip,input,netdev "$app"
#================================================= #=================================================
@ -70,7 +70,7 @@ ynh_add_systemd_config
if [ "$launch_on_boot" -eq 0 ] if [ "$launch_on_boot" -eq 0 ]
then then
sudo systemctl disable "$app" systemctl disable "$app"
fi fi
@ -78,6 +78,7 @@ fi
# INSTALL DEPENDENCIES AND KODI # INSTALL DEPENDENCIES AND KODI
#================================================= #=================================================
if [[ $arch != arm* ]]; then if [[ $arch != arm* ]]; then
cp ../conf/kodi.list "/etc/apt/sources.list.d/${app}.list"
ynh_package_update ynh_package_update
ynh_package_install xorg xinit dbus-x11 kodi ynh_package_install xorg xinit dbus-x11 kodi
else else
@ -89,7 +90,7 @@ fi
#================================================= #=================================================
# X11 SETTINGS # X11 SETTINGS
#================================================= #=================================================
sudo sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.config ynh_replace_string "allowed_users=console" "allowed_users=anybody" /etc/X11/Xwrapper.config
#================================================= #=================================================
@ -101,17 +102,17 @@ yunohost service add "$app" --log "$final_path/.kodi/temp/kodi.log"
#================================================= #=================================================
# CONTROL WEB INTERFACE # CONTROL WEB INTERFACE
#================================================= #=================================================
sudo mkdir -p "$final_path/.kodi/userdata/" mkdir -p "$final_path/.kodi/userdata/"
sudo cp ../conf/advancedsettings.xml "$final_path/.kodi/userdata/advancedsettings.xml" cp ../conf/advancedsettings.xml "$final_path/.kodi/userdata/advancedsettings.xml"
if [[ $arch != arm* ]]; then if [[ $arch != arm* ]]; then
sudo wget -q $chorus2_package -P /tmp wget -q $chorus2_package -P /tmp
sudo unzip /tmp/webinterface.default.2.4.4.zip -d /tmp/ unzip /tmp/webinterface.default.2.4.4.zip -d /tmp/
sudo mkdir -p "$final_path/.kodi/addons/" mkdir -p "$final_path/.kodi/addons/"
sudo mv /tmp/webinterface.default/ "$final_path/.kodi/addons/webinterface.chorus2/" mv /tmp/webinterface.default/ "$final_path/.kodi/addons/webinterface.chorus2/"
fi fi
sudo chown -R "$app":"$app" "$final_path" chown -R "$app":"$app" "$final_path"
if [ "$open_webserver_port" -eq 1 ] if [ "$open_webserver_port" -eq 1 ]
then then
@ -124,7 +125,7 @@ fi
#================================================= #=================================================
finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf" finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_backup_if_checksum_is_different "$finalnginxconf" ynh_backup_if_checksum_is_different "$finalnginxconf"
sudo cp ../conf/nginx.conf "$finalnginxconf" cp ../conf/nginx.conf "$finalnginxconf"
if [ "$path_url" == "/" ]; then if [ "$path_url" == "/" ]; then
ynh_replace_string "__PATH__/" "/" "$finalnginxconf" ynh_replace_string "__PATH__/" "/" "$finalnginxconf"
@ -147,4 +148,4 @@ systemctl reload nginx
#================================================= #=================================================
# START KODI # START KODI
#================================================= #=================================================
sudo systemctl start "$app" systemctl start "$app"

5
scripts/remove
View file

@ -57,14 +57,13 @@ then
echo "Remove $app service" echo "Remove $app service"
yunohost service remove "$app" yunohost service remove "$app"
fi fi
sudo systemctl daemon-reload systemctl daemon-reload
#================================================= #=================================================
# X11 SETTINGS # X11 SETTINGS
#================================================= #=================================================
sudo sed -i 's/allowed_users=anybody/allowed_users=console/' /etc/X11/Xwrapper.config ynh_replace_string "allowed_users=anybody" "allowed_users=console" /etc/X11/Xwrapper.config
#================================================= #=================================================
# REMOVE DEPENDENCIES AND KODI # REMOVE DEPENDENCIES AND KODI

13
scripts/restore
View file

@ -57,9 +57,9 @@ test ! -d "$final_path" \
# CREATE KODI USER # CREATE KODI USER
#================================================= #=================================================
ynh_system_user_create "$app" "$final_path" ynh_system_user_create "$app" "$final_path"
sudo mkdir "$final_path" mkdir "$final_path"
sudo chown -R "$app":"$app" "$final_path" chown -R "$app":"$app" "$final_path"
sudo usermod -a -G cdrom,audio,video,plugdev,users,dialout,dip,input,netdev "$app" usermod -a -G cdrom,audio,video,plugdev,users,dialout,dip,input,netdev "$app"
#================================================= #=================================================
@ -93,7 +93,7 @@ yunohost service add "$app" --log "$final_path/.kodi/temp/kodi.log"
#================================================= #=================================================
if [ "$launch_on_boot" -eq 0 ] if [ "$launch_on_boot" -eq 0 ]
then then
sudo systemctl disable "$app" systemctl disable "$app"
else else
systemctl enable "$app".service systemctl enable "$app".service
fi fi
@ -115,8 +115,7 @@ fi
#================================================= #=================================================
# X11 SETTINGS # X11 SETTINGS
#================================================= #=================================================
sudo sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.config ynh_replace_string "allowed_users=console" "allowed_users=anybody" /etc/X11/Xwrapper.config
#================================================= #=================================================
# CONTROL WEB INTERFACE # CONTROL WEB INTERFACE
@ -137,4 +136,4 @@ systemctl reload nginx
#================================================= #=================================================
# START KODI # START KODI
#================================================= #=================================================
sudo systemctl start "$app" systemctl start "$app"

10
scripts/upgrade
View file

@ -51,7 +51,7 @@ fi
#================================================= #=================================================
# STOP KODI # STOP KODI
#================================================= #=================================================
sudo systemctl stop "$app" systemctl stop "$app"
#================================================= #=================================================
@ -79,6 +79,7 @@ ynh_add_systemd_config
# INSTALL DEPENDENCIES AND KODI # INSTALL DEPENDENCIES AND KODI
#================================================= #=================================================
if [[ "$arch" != arm* ]]; then if [[ "$arch" != arm* ]]; then
cp ../conf/kodi.list "/etc/apt/sources.list.d/${app}.list"
ynh_package_update ynh_package_update
ynh_package_install xorg xinit dbus-x11 kodi ynh_package_install xorg xinit dbus-x11 kodi
else else
@ -91,8 +92,7 @@ fi
#================================================= #=================================================
# X11 SETTINGS # X11 SETTINGS
#================================================= #=================================================
sudo sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.config ynh_replace_string "allowed_users=console" "allowed_users=anybody" /etc/X11/Xwrapper.config
#================================================= #=================================================
# CONTROL WEB INTERFACE # CONTROL WEB INTERFACE
@ -108,7 +108,7 @@ fi
#================================================= #=================================================
finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf" finalnginxconf="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_backup_if_checksum_is_different "$finalnginxconf" ynh_backup_if_checksum_is_different "$finalnginxconf"
sudo cp ../conf/nginx.conf "$finalnginxconf" cp ../conf/nginx.conf "$finalnginxconf"
if [ "$path_url" == "/" ]; then if [ "$path_url" == "/" ]; then
ynh_replace_string "__PATH__/" "/" "$finalnginxconf" ynh_replace_string "__PATH__/" "/" "$finalnginxconf"
@ -132,7 +132,7 @@ systemctl reload nginx
#================================================= #=================================================
# START KODI # START KODI
#================================================= #=================================================
sudo systemctl start "$app" systemctl start "$app"