From f6314a7f234c457dce7d79570096128261bc55df Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 4 Sep 2021 23:18:32 +0200 Subject: [PATCH 01/13] Add description --- doc/DESCRIPTION.md | 1 + doc/DESCRIPTION_fr.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..4876cce --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..7b1516e --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Scratch est un langage de programmation graphique manipulable et exécutable par le logiciel de même nom à vocation éducative. Ainsi, Scratch est à la fois un environnement de développement et un moteur d’exécution du langage Scratch mais aussi un site web. \ No newline at end of file From 53b478b950bc67092bc72e34b14d92f3bcfbb9ed Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 4 Sep 2021 21:18:38 +0000 Subject: [PATCH 02/13] 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 fede45d..30181d4 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Programming language to create your own interactive stories, games, and animations +Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations. **Shipped version:** 3.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 55522ff..13b0ede 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Langage de programmation pour créer vos propres histoires, jeux et animations interactifs +Scratch est un langage de programmation graphique manipulable et exécutable par le logiciel de même nom à vocation éducative. Ainsi, Scratch est à la fois un environnement de développement et un moteur d’exécution du langage Scratch mais aussi un site web. **Version incluse :** 3.0~ynh1 From bd746692079c924f3ff3b87d08ca3dcba6e276a1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 10:23:49 +0200 Subject: [PATCH 03/13] Add auto updates --- .github/ISSUE_TEMPLATE.md | 55 +++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++ .github/workflows/updater.sh | 131 +++++++++++++++++++++++++++++++ .github/workflows/updater.yml | 48 +++++++++++ manifest.json | 7 +- scripts/restore | 2 - 6 files changed, 253 insertions(+), 6 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/workflows/updater.sh create mode 100644 .github/workflows/updater.yml 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/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100644 index 0000000..f29cef0 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,131 @@ +#!/bin/bash + +#================================================= +# PACKAGE UPDATING HELPER +#================================================= + +# This script is meant to be run by GitHub Actions +# The YunoHost-Apps organisation offers a template Action to run this script periodically +# Since each app is different, maintainers can adapt its contents so as to perform +# automatic actions when a new upstream release is detected. + +# Remove this exit command when you are ready to run this Action +#exit 1 + +#================================================= +# FETCHING LATEST RELEASE AND ITS ASSETS +#================================================= + +# Fetching information +current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') +repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) +assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) + +# if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then +# version=${version:1} +# fi + +# Setting up the environment variables +echo "Current version: $current_version" +echo "Latest release from upstream: $version" +echo "VERSION=$version" >> $GITHUB_ENV +# For the time being, let's assume the script will fail +echo "PROCEED=false" >> $GITHUB_ENV + +# Proceed only if the retrieved version is greater than the current one +if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then + echo "::warning ::No new version available" + exit 0 +# Proceed only if a PR for this new version does not already exist +elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then + echo "::warning ::A branch already exists for this update" + exit 0 +fi + +# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) +echo "${#assets[@]} available asset(s)" + +#================================================= +# UPDATE SOURCE FILES +#================================================= + +# Here we use the $assets variable to get the resources published in the upstream release. +# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. + +# Let's loop over the array of assets URLs +for asset_url in ${assets[@]}; do + +echo "Handling asset at $asset_url" + +# Assign the asset to a source file in conf/ directory +# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) +# Leave $src empty to ignore the asset +case $asset_url in + *".zip"*) + src="app" + ;; +esac + +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then + +# Create the temporary directory +tempdir="$(mktemp -d)" + +# Download sources and calculate checksum +filename=${asset_url##*/} +curl --silent -4 -L $asset_url -o "$tempdir/$filename" +checksum=$(sha256sum "$tempdir/$filename" | head -c 64) + +# Delete temporary directory +rm -rf $tempdir + +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi + +# Rewrite source file +cat < conf/$src.src +SOURCE_URL=$asset_url +SOURCE_SUM=$checksum +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=$extension +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME=scratch.zip +SOURCE_EXTRACT=true +EOT +echo "... conf/$src.src updated" + +else +echo "... asset ignored" +fi + +done + +#================================================= +# SPECIFIC UPDATE STEPS +#================================================= + +# Any action on the app's source code can be done. +# The GitHub Action workflow takes care of committing all changes after this script ends. + +#================================================= +# GENERIC FINALIZATION +#================================================= + +# Install moreutils, needed for sponge +sudo apt-get install moreutils + +# Replace new version in manifest +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json + +# No need to update the README, yunohost-bot takes care of it + +# The Action will proceed only if the PROCEED environment variable is set to true +echo "PROCEED=true" >> $GITHUB_ENV +exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 0000000..ca77fed --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,48 @@ +# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. +# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. +# This file should be enough by itself, but feel free to tune it to your needs. +# It calls updater.sh, which is where you should put the app-specific update steps. +name: Check for new upstream releases +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it every day at 6:00 UTC + schedule: + - cron: '0 6 * * *' +jobs: + updater: + runs-on: ubuntu-latest + steps: + - name: Fetch the source code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Run the updater script + id: run_updater + run: | + # Setting up Git user + git config --global user.name 'yunohost-bot' + git config --global user.email 'yunohost-bot@users.noreply.github.com' + # Run the updater script + /bin/bash .github/workflows/updater.sh + - name: Commit changes + id: commit + if: ${{ env.PROCEED == 'true' }} + run: | + git commit -am "Upgrade to v$VERSION" + - name: Create Pull Request + id: cpr + if: ${{ env.PROCEED == 'true' }} + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update to version ${{ env.VERSION }} + committer: 'yunohost-bot ' + author: 'yunohost-bot ' + signoff: false + branch: ci-auto-update-v${{ env.VERSION }} + delete-branch: true + title: 'Upgrade to version ${{ env.VERSION }}' + body: | + Upgrade to v${{ env.VERSION }} + draft: false diff --git a/manifest.json b/manifest.json index de8abcc..e07e17d 100644 --- a/manifest.json +++ b/manifest.json @@ -17,8 +17,8 @@ }, "license": "BSD-3-Clause", "maintainer": { - "name": "liberodark", - "email": "liberodark@gmail.com" + "name": "", + "email": "" }, "requirements": { "yunohost": ">= 4.2.4" @@ -30,8 +30,7 @@ "arguments": { "install": [{ "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/restore b/scripts/restore index afaefab..bacee9f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,8 +32,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 " From 6a2944d778d564fb865f9372bdc5dbb7ac58fb65 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 10:24:08 +0200 Subject: [PATCH 04/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index e07e17d..b4388f4 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,7 @@ }, "license": "BSD-3-Clause", "maintainer": { - "name": "", + "name": "eric_G", "email": "" }, "requirements": { From 014c7191d5ff8e787ad1ba4a8453cf58f370f021 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 10:24:24 +0200 Subject: [PATCH 05/13] Update _common.sh --- scripts/_common.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 572cd27..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,6 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -#pkg_dependencies="deb1 deb2 php$YNH_DEFAULT_PHP_VERSION-deb1 php$YNH_DEFAULT_PHP_VERSION-deb2" - #================================================= # PERSONAL HELPERS #================================================= From 60a7172d86568fa3343cea95d8c0359706a10115 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Nov 2021 13:44:29 +0100 Subject: [PATCH 06/13] 4.3 --- conf/nginx.conf | 5 ----- manifest.json | 2 +- scripts/backup | 4 ---- scripts/install | 4 ---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index c9a959d..6bce0dd 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.html; # Include SSOWAT user panel. diff --git a/manifest.json b/manifest.json index b4388f4..0f3556a 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/backup b/scripts/backup index e43d75e..6201eec 100644 --- a/scripts/backup +++ b/scripts/backup @@ -14,10 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/install b/scripts/install index 58bcc05..ae520a6 100644 --- a/scripts/install +++ b/scripts/install @@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors From 9cf5e696b3425aecbddaebd59feaaa27ce07e2a9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 8 Jan 2022 08:51:03 +0100 Subject: [PATCH 07/13] Update restore --- scripts/restore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index bacee9f..89414a6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,8 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS From e4f59f6fdfaee0db1bdd0e906c0a7c2dd1655efc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 9 Oct 2022 11:12:12 +0200 Subject: [PATCH 08/13] Update restore --- scripts/restore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 89414a6..483ee3e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,7 +32,8 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS From d526134ded6e79e9317d90526ba332dbefa7a393 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Oct 2022 09:12:17 +0000 Subject: [PATCH 09/13] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 30181d4..9e42808 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Scratch for YunoHost -[![Integration level](https://dash.yunohost.org/integration/scratch.svg)](https://dash.yunohost.org/appci/app/scratch) ![](https://ci-apps.yunohost.org/ci/badges/scratch.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/scratch.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/scratch.svg)](https://dash.yunohost.org/appci/app/scratch) ![Working status](https://ci-apps.yunohost.org/ci/badges/scratch.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/scratch.maintain.svg) [![Install Scratch with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scratch) *[Lire ce readme en français.](./README_fr.md)* @@ -23,25 +23,26 @@ Scratch is a free programming language and online community where you can create ## Screenshots -![](./doc/screenshots/800px-Scratch_3.0_Éditeur.png) +![Screenshot of Scratch](./doc/screenshots/800px-Scratch_3.0_Éditeur.png) ## Documentation and resources -* Official app website: https://scratch.mit.edu/ -* Official admin documentation: https://fr.scratch-wiki.info/wiki/Scratch_3.0 -* Upstream app code repository: https://github.com/LLK/scratch-gui -* YunoHost documentation for this app: https://yunohost.org/app_scratch -* Report a bug: https://github.com/YunoHost-Apps/scratch_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/scratch_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/scratch_ynh/tree/testing --debug or sudo yunohost app upgrade scratch -u https://github.com/YunoHost-Apps/scratch_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 13b0ede..488a195 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Scratch pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/scratch.svg)](https://dash.yunohost.org/appci/app/scratch) ![](https://ci-apps.yunohost.org/ci/badges/scratch.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/scratch.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/scratch.svg)](https://dash.yunohost.org/appci/app/scratch) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/scratch.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/scratch.maintain.svg) [![Installer Scratch avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=scratch) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Scratch rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -19,25 +23,26 @@ Scratch est un langage de programmation graphique manipulable et exécutable par ## Captures d'écran -![](./doc/screenshots/800px-Scratch_3.0_Éditeur.png) +![Capture d'écran de Scratch](./doc/screenshots/800px-Scratch_3.0_Éditeur.png) ## Documentations et ressources -* Site officiel de l'app : https://scratch.mit.edu/ -* Documentation officielle de l'admin : https://fr.scratch-wiki.info/wiki/Scratch_3.0 -* Dépôt de code officiel de l'app : https://github.com/LLK/scratch-gui -* Documentation YunoHost pour cette app : https://yunohost.org/app_scratch -* Signaler un bug : https://github.com/YunoHost-Apps/scratch_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/scratch_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/scratch_ynh/tree/testing --debug ou sudo yunohost app upgrade scratch -u https://github.com/YunoHost-Apps/scratch_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From cc0195bff52516f282a8dbc32a99691d69482e27 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 9 Oct 2022 11:13:33 +0200 Subject: [PATCH 10/13] fix linter --- manifest.json | 2 +- scripts/restore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 0f3556a..78ea89d 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/restore b/scripts/restore index 483ee3e..bacee9f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path +test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " #================================================= From 294d3009dea93f2da7802df9922cbc3f6c144386 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 9 Oct 2022 11:14:26 +0200 Subject: [PATCH 11/13] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index c38baff..ca0366a 100644 --- a/check_process +++ b/check_process @@ -5,7 +5,7 @@ is_public=1 ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 setup_private=1 From f7d3f43a89a6c45527ca194f1c990a1c0f744ee6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Oct 2022 09:38:01 +0200 Subject: [PATCH 12/13] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 78ea89d..8074dd1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Programming language to create your own interactive stories, games, and animations", "fr": "Langage de programmation pour créer vos propres histoires, jeux et animations interactifs" }, - "version": "3.0~ynh1", + "version": "3.0~ynh2", "url": "https://scratch.mit.edu/", "upstream": { "license": "BSD-3-Clause", From bdd819500318ba6ca1dd09dd0f189b7380066417 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Oct 2022 07:38:06 +0000 Subject: [PATCH 13/13] 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 9e42808..89f1277 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 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations. -**Shipped version:** 3.0~ynh1 +**Shipped version:** 3.0~ynh2 **Demo:** https://llk.github.io/scratch-gui/develop/ diff --git a/README_fr.md b/README_fr.md index 488a195..4c922e7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Scratch est un langage de programmation graphique manipulable et exécutable par le logiciel de même nom à vocation éducative. Ainsi, Scratch est à la fois un environnement de développement et un moteur d’exécution du langage Scratch mais aussi un site web. -**Version incluse :** 3.0~ynh1 +**Version incluse :** 3.0~ynh2 **Démo :** https://llk.github.io/scratch-gui/develop/