Merge pull request #7 from YunoHost-Apps/testing

Testing

README.md

@@ -14,7 +14,7 @@ It enables you to run classic games on a wide range of computers and consoles th
 
 The RetroArch Web Player is RetroArch compiled through [Emscripten](http://kripken.github.io/emscripten-site/).
 
-**Shipped version:** 1.9.2
+**Shipped version:** 1.9.4
 
 ## Screenshots
 

README_fr.md

@@ -15,7 +15,7 @@ Il vous permet de rejouer à des classiques du jeu vidéo sur une large gamme d'
 Le Web Player Retroarch utilise RetroArch compilé grace à [Emscripten](http://kripken.github.io/emscripten-site/).
 
 
-**Version incluse:** 1.9.2
+**Version incluse:** 1.9.4
 
 ## Captures d'écran
 

conf/retroarch.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://buildbot.libretro.com/stable/1.9.2/emscripten/RetroArch.7z
+SOURCE_URL=https://buildbot.libretro.com/stable/1.9.4/emscripten/RetroArch.7z
-SOURCE_SUM=38bc86735994cbec6710cb4867ad32291f1fc74276a96187cfec0a4c18228c1b
+SOURCE_SUM=266a8c8e378a378c29c3e1fa7129e09bd124cc58159ebf263c90385adb91b6cd
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=7z
 SOURCE_EXTRACT=false

manifest.json

@@ -6,7 +6,7 @@
         "en": "Emulate videogames system and play videogames through your web browser... and more!",
         "fr": "Emulez des consoles de jeux et jouer à ces jeux vidéos dans votre explorateur web... Et beaucoup plus!"
     },
-    "version": "1.9.2~ynh2",
+    "version": "1.9.4~ynh1",
     "url": "http://www.retroarch.com/",
     "license": "GPL-3.0-or-later",
     "maintainer": {
@@ -14,7 +14,7 @@
         "email": "misterl56@hotmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.2.0"
     },
     "multi_instance": false,
     "services": [

scripts/_common.sh

@@ -14,86 +14,3 @@ pkg_dependencies="p7zip"
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================
-
-# Install or update the main directory yunohost.multimedia
-#
-# usage: ynh_multimedia_build_main_dir
-ynh_multimedia_build_main_dir () {
-        local ynh_media_release="v1.2"
-        local checksum="806a827ba1902d6911095602a9221181"
-
-        # Download yunohost.multimedia scripts
-        wget -nv https://github.com/Yunohost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 2>&1
-
-        # Check the control sum
-        echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \
-                || ynh_die "Corrupt source"
-
-	# Check if the package acl is installed. Or install it.
-	ynh_package_is_installed 'acl' \
-		|| ynh_package_install acl
-
-        # Extract
-        mkdir yunohost.multimedia-master
-        tar -xf ${ynh_media_release}.tar.gz -C yunohost.multimedia-master --strip-components 1
-        ./yunohost.multimedia-master/script/ynh_media_build.sh
-}
-
-# Add a directory in yunohost.multimedia
-# This "directory" will be a symbolic link to a existing directory.
-#
-# usage: ynh_multimedia_addfolder "Source directory" "Destination directory"
-#
-# | arg: -s, --source_dir= - Source directory - The real directory which contains your medias.
-# | arg: -d, --dest_dir= - Destination directory - The name and the place of the symbolic link, relative to "/home/yunohost.multimedia"
-ynh_multimedia_addfolder () {
-	# Declare an array to define the options of this helper.
-	declare -Ar args_array=( [s]=source_dir= [d]=dest_dir= )
-	local source_dir
-	local dest_dir
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-
-	./yunohost.multimedia-master/script/ynh_media_addfolder.sh --source="$source_dir" --dest="$dest_dir"
-}
-
-# Move a directory in yunohost.multimedia, and replace by a symbolic link
-#
-# usage: ynh_multimedia_movefolder "Source directory" "Destination directory"
-#
-# | arg: -s, --source_dir= - Source directory - The real directory which contains your medias.
-# It will be moved to "Destination directory"
-# A symbolic link will replace it.
-# | arg: -d, --dest_dir= - Destination directory - The new name and place of the directory, relative to "/home/yunohost.multimedia"
-ynh_multimedia_movefolder () {
-	# Declare an array to define the options of this helper.
-	declare -Ar args_array=( [s]=source_dir= [d]=dest_dir= )
-	local source_dir
-	local dest_dir
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-
-	./yunohost.multimedia-master/script/ynh_media_addfolder.sh --inv --source="$source_dir" --dest="$dest_dir"
-}
-
-# Allow an user to have an write authorisation in multimedia directories
-#
-# usage: ynh_multimedia_addaccess user_name
-#
-# | arg: -u, --user_name= - The name of the user which gain this access.
-ynh_multimedia_addaccess () {
-	# Declare an array to define the options of this helper.
-	declare -Ar args_array=( [u]=user_name=)
-	local user_name
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-
-	groupadd -f multimedia
-	usermod -a -G multimedia $user_name
-}
-
-

scripts/remove

@@ -39,6 +39,14 @@ ynh_remove_app_dependencies
 
 ynh_secure_remove --file="/etc/cron.d/$app"
 
+#=================================================
+# REMOVE MULTIMEDIA SYMBOLIC LINK
+#=================================================
+ynh_script_progression --message="Removing Game folder..." --weight=1
+
+# Remove the app directory securely
+ynh_secure_remove --file="/home/yunohost.multimedia/share/Game"
+
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================