From cf1b830bbb93606bfa851f28460078f45e28b3c6 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Mon, 23 Aug 2021 21:12:15 +0200 Subject: [PATCH 01/10] Version 1.9.8 --- conf/retroarch.src | 4 ++-- manifest.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/retroarch.src b/conf/retroarch.src index 9a2dfd9..81d6d13 100644 --- a/conf/retroarch.src +++ b/conf/retroarch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://buildbot.libretro.com/stable/1.9.7/emscripten/RetroArch.7z -SOURCE_SUM=4bd6084183e46793aec72572e9387d5335c8b0830333461c9283c85842ff0045 +SOURCE_URL=https://buildbot.libretro.com/stable/1.9.8/emscripten/RetroArch.7z +SOURCE_SUM=1d0828264ce47c09dd20263a87bed9349e5db2afd66fb86d7e4272d28f88a965 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=7z SOURCE_EXTRACT=false diff --git a/manifest.json b/manifest.json index 73c207f..74dd233 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "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.7~ynh2", + "version": "1.9.8~ynh1", "url": "http://www.retroarch.com/", "upstream": { - "version": "1.9.7", + "version": "1.9.8", "license": "GPL-3.0-or-later", "website": "http://www.retroarch.com/", "demo": "https://web.libretro.com/", From c661c1fff34716f80bdad3896a5e7e912ae3c84c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 23 Aug 2021 19:12:18 +0000 Subject: [PATCH 02/10] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7ecafb3..9e2da20 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Emulate videogames system and play videogames through your web browser... and more! -**Shipped version:** 1.9.7 +**Shipped version:** 1.9.8 **Demo:** https://web.libretro.com/ diff --git a/README_fr.md b/README_fr.md index 82b0390..47760a2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Emulez des consoles de jeux et jouer à ces jeux vidéos dans votre explorateur web... Et beaucoup plus! -**Version incluse :** 1.9.7 +**Version incluse :** 1.9.8 **Démo :** https://web.libretro.com/ From 1462d82fca1304d1cd811db41d7fe52fb5a01a81 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 24 Aug 2021 21:57:35 +0200 Subject: [PATCH 03/10] 1.9.8 sha256sum --- conf/retroarch.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/retroarch.src b/conf/retroarch.src index 81d6d13..4fa1bfd 100644 --- a/conf/retroarch.src +++ b/conf/retroarch.src @@ -1,5 +1,5 @@ SOURCE_URL=https://buildbot.libretro.com/stable/1.9.8/emscripten/RetroArch.7z -SOURCE_SUM=1d0828264ce47c09dd20263a87bed9349e5db2afd66fb86d7e4272d28f88a965 +SOURCE_SUM=03166297e546e44755f1bacd8a4bbc90b58fae746864c3f67eaadd8c814906b2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=7z SOURCE_EXTRACT=false From 3599fede98c12a59e94f1b64b6a3bae9b91c417c Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 24 Aug 2021 22:08:40 +0200 Subject: [PATCH 04/10] Automatic version path --- conf/{retroarch.src => app.src.default} | 2 +- scripts/install | 1 + scripts/upgrade | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) rename conf/{retroarch.src => app.src.default} (59%) diff --git a/conf/retroarch.src b/conf/app.src.default similarity index 59% rename from conf/retroarch.src rename to conf/app.src.default index 4fa1bfd..c02c70b 100644 --- a/conf/retroarch.src +++ b/conf/app.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://buildbot.libretro.com/stable/1.9.8/emscripten/RetroArch.7z +SOURCE_URL=https://buildbot.libretro.com/stable/__UPSTREAM_VERSION__/emscripten/RetroArch.7z SOURCE_SUM=03166297e546e44755f1bacd8a4bbc90b58fae746864c3f67eaadd8c814906b2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=7z diff --git a/scripts/install b/scripts/install index a83bd20..9b09f4f 100755 --- a/scripts/install +++ b/scripts/install @@ -67,6 +67,7 @@ ynh_script_progression --message="Setting up source files..." --weight=60 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_add_config --template="../conf/app.src.default" --destination="../conf/app.src" ynh_setup_source --dest_dir="$final_path" --source_id=$app #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 diff --git a/scripts/upgrade b/scripts/upgrade index c34ff6a..57bb24a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,6 +57,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src + ynh_add_config --template="../conf/app.src.default" --destination="../conf/app.src" ynh_setup_source --dest_dir="$final_path" --source_id=$app #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 From b9c04042b14181faf9b99d6a231e37772aced305 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Wed, 25 Aug 2021 21:28:21 +0200 Subject: [PATCH 05/10] Automatic version patch --- scripts/install | 1 + scripts/upgrade | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 9b09f4f..c7386af 100755 --- a/scripts/install +++ b/scripts/install @@ -28,6 +28,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME +upstream_version=$YNH_APP_MANIFEST_VERSION #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS diff --git a/scripts/upgrade b/scripts/upgrade index 57bb24a..a296944 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,6 +15,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME +upstream_version=$YNH_APP_MANIFEST_VERSION domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) From 45076ed34e27267cb7b7693ffcd51777e5b05925 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Thu, 26 Aug 2021 08:36:37 +0200 Subject: [PATCH 06/10] change src name --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index c7386af..ff7bc35 100755 --- a/scripts/install +++ b/scripts/install @@ -68,7 +68,7 @@ ynh_script_progression --message="Setting up source files..." --weight=60 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_add_config --template="../conf/app.src.default" --destination="../conf/app.src" +ynh_add_config --template="../conf/app.src.default" --destination="../conf/retroarch.src" ynh_setup_source --dest_dir="$final_path" --source_id=$app #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 diff --git a/scripts/upgrade b/scripts/upgrade index a296944..bf59918 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_add_config --template="../conf/app.src.default" --destination="../conf/app.src" + ynh_add_config --template="../conf/app.src.default" --destination="../conf/retroarch.src" ynh_setup_source --dest_dir="$final_path" --source_id=$app #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 From 9e69fd5590980936238165d37060102cc6eba61f Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 7 Sep 2021 14:31:36 +0200 Subject: [PATCH 07/10] Retrieve version from manifest --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ff7bc35..da00956 100755 --- a/scripts/install +++ b/scripts/install @@ -28,7 +28,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME -upstream_version=$YNH_APP_MANIFEST_VERSION +upstream_version=$(ynh_app_upstream_version) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS From 698c9b29a8d4ffdc76cfe174ff6638aef431cc91 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Sep 2021 10:11:26 +0200 Subject: [PATCH 08/10] Cleaning up --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ check_process | 16 +++------- doc/DESCRIPTION.md | 4 +++ doc/DISCLAIMER.md | 12 ++----- doc/DISCLAIMER_fr.md | 8 +---- manifest.json | 4 +-- pull_request_template.md | 18 ----------- scripts/_common.sh | 2 ++ scripts/backup | 2 -- scripts/change_url | 13 +++----- scripts/install | 9 +++--- scripts/remove | 8 ++--- scripts/restore | 5 --- scripts/upgrade | 11 ++----- 15 files changed, 100 insertions(+), 83 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 doc/DESCRIPTION.md delete mode 100644 pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/check_process b/check_process index b5980d8..834b960 100644 --- a/check_process +++ b/check_process @@ -1,12 +1,9 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) -# path="/retroarch" (PATH) -# admin="john" (USER) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" +# path="/retroarch" +# admin="john" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -18,11 +15,7 @@ upgrade=1 from_commit=cabb7f092671eb34504972fcebe9c8285653754b backup_restore=1 multi_instance=0 - port_already_use=0 #No port required change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email=misterl56@hotmail.com Notification=none @@ -30,4 +23,3 @@ Notification=none ; commit=CommitHash name=Name and date of the commit. manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..b80516c --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,4 @@ +RetroArch is a frontend for emulators, game engines and media players. +It enables you to run classic games on a wide range of computers and consoles through its slick graphical interface. Settings are also unified so configuration is done once and for all. +In addition to this, you are able to run original game discs (CDs) from RetroArch. +RetroArch has advanced features like shaders, netplay, rewinding, next-frame response times, runahead, machine translation, blind accessibility features, and more! diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 00d44ac..da64a34 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -5,14 +5,8 @@ Although you can upload a ROM at runtime, retroarch may have access to the ROMs * Games are located in `/opt/yunohost/retroarch/assets/cores`. A symbolic link is created to this folder in `/home/yunohost.multimedia/share/Games`, so that you can place your games from here * cores have to be indexed to work : script `/opt/yunohost/retroarch/indexer.sh` run every 5 minutes to index all games in `opt/yunohost/retroarch/assets/cores` - -### Supported architectures - -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/retroarch/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/retroarch/) - ### Limitations -* cannot save game, in fact, cannot write at all... so configuration is lost each time you start again -* no user management -* some core are listed but not implemented : they do not work, the issue is from the upstream app. +* Cannot save game, in fact, cannot write at all... so configuration is lost each time you start again +* No user management +* Some core are listed but not implemented : they do not work, the issue is from the upstream app. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 831a682..534e6fa 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -4,14 +4,8 @@ Même si vous pouvez uploader une ROM depuis l'application, RetroArch peut accé * Les jeux sont situés dans `/opt/yunohost/retroarch/assets/cores`. Un lien symbolique est créé vers `/home/yunohost.multimedia/share/Games` de façon à ce que vous puissiez les y mettre facilement. * Les cores doivent être indexés pour fonctionner : le script `/opt/yunohost/retroarch/indexer.sh` tourne toutes les 5 minutes pour indexer tous les jeux dans `opt/yunohost/retroarch/assets/cores` -### Architectures supportées - -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/retroarch/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/retroarch/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/retroarch/) - ### Limitations * On ne peut pas sauvegarder. En fait, on ne peut pas écrire dans les fichiers du tout, donc la configuration est perdue à chaque fois... * Pas de gestion d'utilisateurs -* certains cores sont listés mais ne sont pas implémentés : ils ne fonctionnent donc pas, le problème vient de l'application elle même. +* Certains cores sont listés mais ne sont pas implémentés : ils ne fonctionnent donc pas, le problème vient de l'application elle même. diff --git a/manifest.json b/manifest.json index 74dd233..7878fed 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "retroarch", "packaging_format": 1, "description": { - "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!" + "en": "Emulate videogames system and play videogames through your web browser", + "fr": "Emulez des consoles de jeux et jouer à ces jeux vidéos dans votre explorateur web" }, "version": "1.9.8~ynh1", "url": "http://www.retroarch.com/", diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index a747614..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,18 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/retroarch_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/retroarch_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9d496ef..3e8a58d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,6 +7,8 @@ # dependencies used by the app pkg_dependencies="p7zip" +nodejs_version=10 + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 720f810..96016fb 100755 --- a/scripts/backup +++ b/scripts/backup @@ -48,7 +48,6 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # SPECIFIC BACKUP #================================================= @@ -57,7 +56,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/cron.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/change_url b/scripts/change_url index f0f63f7..a4f70a9 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,16 +24,11 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) - #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= @@ -72,7 +67,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -103,7 +98,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -111,4 +106,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --time --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index da00956..fedf677 100755 --- a/scripts/install +++ b/scripts/install @@ -54,7 +54,7 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url #================================================= ynh_script_progression --message="Installing dependencies..." --weight=13 -ynh_install_nodejs --nodejs_version=10 +ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs ynh_npm install -g coffeescript @@ -98,6 +98,7 @@ chmod 666 $final_path/assets/cores/Game/README ynh_add_config --template="../conf/indexer.sh" --destination="$final_path/indexer.sh" chown www-data: $final_path/indexer.sh chmod 744 $final_path/indexer.sh + #setup cron file cron_path="/etc/cron.d/$app" ynh_add_config --template="../conf/retroarch.cron" --destination="$cron_path" @@ -107,7 +108,7 @@ chmod 644 "$cron_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=3 +ynh_script_progression --message="Configuring NGINX web server..." --weight=3 #backup & Update nginx MIME type so wasm mime type is recognized @@ -131,7 +132,7 @@ chown -R www-data: $final_path #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] @@ -155,7 +156,7 @@ cd $final_path/assets/cores #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 4c65a58..c438dea 100755 --- a/scripts/remove +++ b/scripts/remove @@ -25,9 +25,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) ynh_script_progression --message="Removing dependencies..." --weight=7 # Remove metapackage and its dependencies -#ynh_remove_app_dependencies -#ynh_use_nodejs -#ynh_npm uninstall -g coffeescript ynh_use_nodejs ynh_npm uninstall -g coffeescript ynh_remove_nodejs @@ -58,7 +55,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config @@ -71,9 +68,8 @@ else ynh_print_warn "/etc/nginx/mime.types has changed! Keeping current file!" fi - #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last \ No newline at end of file +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index ead5395..4a511af 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -59,7 +57,6 @@ if [ !$(grep wasm /etc/nginx/mime.types) ]; then ynh_store_file_checksum --file="/etc/nginx/mime.types" fi - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -89,7 +86,6 @@ ynh_install_nodejs --nodejs_version=10 ynh_use_nodejs ynh_npm install -g coffeescript - #================================================= #SETTING MULTIMEDIA DIRECTORY #================================================= @@ -107,7 +103,6 @@ chmod 666 $final_path/assets/cores/Game/README ynh_restore_file --origin_path="/etc/cron.d/$app" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index bf59918..6b3b7c2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,12 +25,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # CHECK VERSION #================================================= -### This helper will compare the version of the currently installed app and the version of the upstream package. -### $upgrade_type can have 2 different values -### - UPGRADE_APP if the upstream app version has changed -### - UPGRADE_PACKAGE if only the YunoHost package has changed -### ynh_check_app_version_changed will stop the upgrade if the app is up to date. -### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. upgrade_type=$(ynh_check_app_version_changed) #================================================= @@ -111,7 +105,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=20 #Dependencies are not really required as this is just to unzip the 7z file ynh_install_app_dependencies $pkg_dependencies #However, npm IS required to run the coffeescript -ynh_install_nodejs --nodejs_version=10 +ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs ynh_npm install -g coffeescript @@ -120,9 +114,8 @@ ynh_npm install -g coffeescript #================================================= # Set permissions on app files #================================================= -# -chown -R www-data: $final_path +chown -R www-data: $final_path #================================================= # RELOAD NGINX From bbc4f241e041ca36d7bfdb2fc73a4a722255e861 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 8 Sep 2021 08:11:31 +0000 Subject: [PATCH 09/10] Auto-update README --- README.md | 18 ++++++++---------- README_fr.md | 14 ++++++-------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 9e2da20..a4a054b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Emulate videogames system and play videogames through your web browser... and more! +RetroArch is a frontend for emulators, game engines and media players. +It enables you to run classic games on a wide range of computers and consoles through its slick graphical interface. Settings are also unified so configuration is done once and for all. +In addition to this, you are able to run original game discs (CDs) from RetroArch. +RetroArch has advanced features like shaders, netplay, rewinding, next-frame response times, runahead, machine translation, blind accessibility features, and more! + **Shipped version:** 1.9.8 @@ -36,17 +40,11 @@ Although you can upload a ROM at runtime, retroarch may have access to the ROMs * Games are located in `/opt/yunohost/retroarch/assets/cores`. A symbolic link is created to this folder in `/home/yunohost.multimedia/share/Games`, so that you can place your games from here * cores have to be indexed to work : script `/opt/yunohost/retroarch/indexer.sh` run every 5 minutes to index all games in `opt/yunohost/retroarch/assets/cores` - -### Supported architectures - -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/retroarch/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/retroarch/) - ### Limitations -* cannot save game, in fact, cannot write at all... so configuration is lost each time you start again -* no user management -* some core are listed but not implemented : they do not work, the issue is from the upstream app. +* Cannot save game, in fact, cannot write at all... so configuration is lost each time you start again +* No user management +* Some core are listed but not implemented : they do not work, the issue is from the upstream app. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 47760a2..4f5d533 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Emulez des consoles de jeux et jouer à ces jeux vidéos dans votre explorateur web... Et beaucoup plus! +RetroArch is a frontend for emulators, game engines and media players. +It enables you to run classic games on a wide range of computers and consoles through its slick graphical interface. Settings are also unified so configuration is done once and for all. +In addition to this, you are able to run original game discs (CDs) from RetroArch. +RetroArch has advanced features like shaders, netplay, rewinding, next-frame response times, runahead, machine translation, blind accessibility features, and more! + **Version incluse :** 1.9.8 @@ -31,17 +35,11 @@ Même si vous pouvez uploader une ROM depuis l'application, RetroArch peut accé * Les jeux sont situés dans `/opt/yunohost/retroarch/assets/cores`. Un lien symbolique est créé vers `/home/yunohost.multimedia/share/Games` de façon à ce que vous puissiez les y mettre facilement. * Les cores doivent être indexés pour fonctionner : le script `/opt/yunohost/retroarch/indexer.sh` tourne toutes les 5 minutes pour indexer tous les jeux dans `opt/yunohost/retroarch/assets/cores` -### Architectures supportées - -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/retroarch/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/retroarch/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/retroarch%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/retroarch/) - ### Limitations * On ne peut pas sauvegarder. En fait, on ne peut pas écrire dans les fichiers du tout, donc la configuration est perdue à chaque fois... * Pas de gestion d'utilisateurs -* certains cores sont listés mais ne sont pas implémentés : ils ne fonctionnent donc pas, le problème vient de l'application elle même. +* Certains cores sont listés mais ne sont pas implémentés : ils ne fonctionnent donc pas, le problème vient de l'application elle même. ## Documentations et ressources From 406938553c569216a0ea1224ed38d85cf810db99 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Wed, 8 Sep 2021 23:57:41 +0200 Subject: [PATCH 10/10] damit upstream version! --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index bf59918..6a4da98 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -upstream_version=$YNH_APP_MANIFEST_VERSION +upstream_version=$(ynh_app_upstream_version) domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path)