From eaac39673fb7e97bc2a600aee9d208445dc3fb79 Mon Sep 17 00:00:00 2001 From: Guilhem Bonnefille Date: Tue, 27 Dec 2022 21:32:26 +0100 Subject: [PATCH 1/3] fix: create armel source --- conf/armel.src | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 conf/armel.src diff --git a/conf/armel.src b/conf/armel.src new file mode 100644 index 0000000..dfd111b --- /dev/null +++ b/conf/armel.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.22.1/syncthing-linux-arm-v1.22.1.tar.gz +SOURCE_SUM=6506b24baa1cc22b088e4cf0b67eb738dc813f4b23865d8b8ff0456a2c2efa0b +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= From e1538070a67807ae44902cfaebc03db1fe408475 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 17 Jan 2023 20:52:04 +0100 Subject: [PATCH 2/3] include upgrade --- .github/workflows/updater.sh | 104 ++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 49 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index dc09aa4..80f1948 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -24,24 +24,25 @@ assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ # Sometimes the release name starts with a "v", so let's filter it out. # You may need more tweaks here if the upstream repository has different naming conventions. if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} + 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 +echo "REPO=$repo" >> $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 + 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 + 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.) @@ -57,64 +58,70 @@ echo "${#assets[@]} available asset(s)" # Let's loop over the array of assets URLs for asset_url in ${assets[@]}; do -echo "Handling asset at $asset_url" + 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 - *"linux-arm-"*) - src="armhf" - ;; - *"linux-arm64-"*) - src="arm64" - ;; - *"linux-386-"*) - src="i386" - ;; - *"linux-amd64-"*) - src="amd64" - ;; - *) - src="" - ;; -esac + # 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 + *"linux-arm-"*) + src="armhf" + ;; + *"linux-arm64-"*) + src="arm64" + ;; + *"linux-386-"*) + src="i386" + ;; + *"linux-amd64-"*) + src="amd64" + ;; + *) + src="" + ;; + esac -# If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then + # If $src is not empty, let's process the asset + if [ ! -z "$src" ]; then -# Create the temporary directory -tempdir="$(mktemp -d)" + # 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) + # 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 + # Delete temporary directory + rm -rf $tempdir -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi + # Get extension + if [[ $filename == *.tar.gz ]]; then + extension=tar.gz + else + extension=${filename##*.} + fi -# Rewrite source file -cat < conf/$src.src + # 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= +SOURCE_EXTRACT=true EOT -echo "... conf/$src.src updated" + echo "... conf/$src.src updated" + if [ "$src" == "armhf" ] + then + cp -f conf/armhf.src conf/armel.src + echo "... conf/armel.src updated" + fi -else -echo "... asset ignored" -fi + else + echo "... asset ignored" + fi done @@ -137,4 +144,3 @@ echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > # The Action will proceed only if the PROCEED environment variable is set to true echo "PROCEED=true" >> $GITHUB_ENV exit 0 - From 7f1876377a2e4d8f2f11ffee8d6d82f634d3876f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 24 Jan 2023 21:56:41 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 2 +- README_fr.md | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 437d84f..6c4649b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Syncthing for YunoHost -[![Integration level](https://dash.yunohost.org/integration/syncthing.svg)](https://dash.yunohost.org/appci/app/syncthing) ![Working status](https://ci-apps.yunohost.org/ci/badges/syncthing.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/syncthing.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/syncthing.svg)](https://dash.yunohost.org/appci/app/syncthing) ![Working status](https://ci-apps.yunohost.org/ci/badges/syncthing.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/syncthing.maintain.svg) [![Install Syncthing with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=syncthing) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 81b225d..b44c93a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,30 +5,30 @@ It shall NOT be edited by hand. # Syncthing pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/syncthing.svg)](https://dash.yunohost.org/appci/app/syncthing) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/syncthing.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/syncthing.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/syncthing.svg)](https://dash.yunohost.org/appci/app/syncthing) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/syncthing.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/syncthing.maintain.svg) [![Installer Syncthing avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=syncthing) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Syncthing 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.* +> *Ce package vous permet d’installer Syncthing 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.* -## Vue d'ensemble +## Vue d’ensemble Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet. **Version incluse :** 1.22.1~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de Syncthing](./doc/screenshots/screenshot1.png) +![Capture d’écran de Syncthing](./doc/screenshots/screenshot1.png) ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l’app : * Documentation officielle utilisateur : -* Dépôt de code officiel de l'app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -44,4 +44,4 @@ ou sudo yunohost app upgrade syncthing -u https://github.com/YunoHost-Apps/syncthing_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file