From ac1cedff4e2ee6e265a9f0a4085f11fe6b6de3a1 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 25 Apr 2021 16:50:33 +0200 Subject: [PATCH] Move to 1.9.1 --- conf/retroarch.src | 4 ++-- manifest.json | 6 +++--- scripts/install | 16 ++++++++-------- scripts/remove | 25 +++---------------------- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/conf/retroarch.src b/conf/retroarch.src index 19a039d..1ece416 100644 --- a/conf/retroarch.src +++ b/conf/retroarch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://buildbot.libretro.com/stable/1.8.7/emscripten/RetroArch.7z -SOURCE_SUM=7baa982226c649e0524555ab88b118c1f5fd6c9ca4403483b4fd1835e8ace5ad +SOURCE_URL=https://buildbot.libretro.com/stable/1.9.1/emscripten/RetroArch.7z +SOURCE_SUM=89e018028f53d710f63a627c28c2278b8c24f7baae84683538e52b79aca8a4d4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=7z SOURCE_EXTRACT=false diff --git a/manifest.json b/manifest.json index 4205e5f..fe4514c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,15 +6,15 @@ "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.8.6~ynh1", - "url": "https://example.com", + "version": "1.9.1~ynh1", + "url": "http://www.retroarch.com/", "license": "free", "maintainer": { "name": "Krakinou", "email": "misterl56@hotmail.com" }, "requirements": { - "yunohost": ">= 3.8" + "yunohost": ">= 4.1.7" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 2d49c66..e97d16f 100755 --- a/scripts/install +++ b/scripts/install @@ -37,7 +37,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --time --weight=1 -final_path=/var/www/$app +final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path @@ -57,11 +57,9 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= ynh_script_progression --message="Installing dependencies..." --time --weight=1 -#waiting for new version of helpers to be deployed https://github.com/YunoHost/yunohost/blob/stretch-unstable/data/helpers.d/nodejs ynh_install_nodejs --nodejs_version=10 ynh_use_nodejs ynh_npm install -g coffeescript -#npm install -g coffeescript ynh_install_app_dependencies $pkg_dependencies @@ -75,23 +73,25 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src # uncompress and patch done manually as 7z format is not supported ynh_setup_source --dest_dir="$final_path" --source_id=$app -7zr e $final_path/retroarch.7z -o$final_path +#7z archive not handled by ynh and no way to strip component, have to move it manually +7zr x $final_path/retroarch.7z -o$final_path +mv $final_path/retroarch/* $final_path/ rm $final_path/retroarch.7z +rm -r $final_path/retroarch #create additionnal folders & file #https://github.com/libretro/RetroArch/tree/master/pkg/emscripten mkdir -p $final_path/assets/frontend/bundle mkdir -p $final_path/assets/cores touch $final_path/analytics.js #https://github.com/libretro/RetroArch/issues/4539#issuecomment-473345195 -mv $final_path/canvas.png $final_path/media/ #do not ask me why this file is not naturally at the correct place #Get the indexer as exe so that folder w/ ROMs can be indexed chmod +x $final_path/indexer ###install bundle source. As it is change every day (only nightly exists) - ynh_setup_source is useless #ynh_setup_source --dest_dir="$final_path/assets/frontend/bundle" --source_id=bundle -wget -q $(grep 'SOURCE_URL=' "../conf/bundle.src" | cut --delimiter='=' --fields=2-) -O $final_path/assets/frontend/bundle/bundle.zip -unzip -q $final_path/assets/frontend/bundle/bundle.zip -d $final_path/assets/frontend/bundle/ -rm $final_path/assets/frontend/bundle/bundle.zip +#wget -q $(grep 'SOURCE_URL=' "../conf/bundle.src" | cut --delimiter='=' --fields=2-) -O $final_path/assets/frontend/bundle/bundle.zip +#unzip -q $final_path/assets/frontend/bundle/bundle.zip -d $final_path/assets/frontend/bundle/ +#rm $final_path/assets/frontend/bundle/bundle.zip #================================================= # NGINX CONFIGURATION diff --git a/scripts/remove b/scripts/remove index a3a5c0e..dd7bf91 100755 --- a/scripts/remove +++ b/scripts/remove @@ -28,7 +28,9 @@ ynh_script_progression --message="Removing dependencies..." --time --weight=1 #ynh_remove_app_dependencies #ynh_use_nodejs #ynh_npm uninstall -g coffeescript -npm uninstall -g coffeescript +ynh_use_nodejs +ynh_npm uninstall -g coffeescript +ynh_remove_nodejs #================================================= @@ -55,27 +57,6 @@ else ynh_print_warn "/etc/nginx/mime.types has changed! Keeping current file!" fi -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE THE CRON FILE -#================================================= - -# Remove a cron file -#ynh_secure_remove --file="/etc/cron.d/$app" - -# Remove a directory securely -#ynh_secure_remove --file="/etc/$app/" - -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT