diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index 4132929..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,137 +0,0 @@ -#!/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.toml | tomlq -j '.version|split("~")[0]') -repo=$(cat manifest.toml | tomlq -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 "'")) - -# Later down the script, we assume the version has only digits and dots -# 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} -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 -# 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 - *"admin"*) - src="app" - ;; - *"update"*) - src="app-upgrade" - ;; - *) - src="" - ;; -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= -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 -#================================================= - -# Replace new version in manifest -echo "$(tomlq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml - -# 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/README.md b/README.md index befc13a..6a8a38c 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Chitchatter is a free (as in both price and freedom) communication tool. It is d - Ephemeral - Decentralized -**Shipped version:** 1.0~ynh6 +**Shipped version:** 1.0~ynh7 **Demo:** https://chitchatter.im/ diff --git a/README_fr.md b/README_fr.md index c21a071..e3dad14 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,18 +16,18 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Chitchatter is a free (as in both price and freedom) communication tool. It is designed with security and privacy in mind. +Chitchatter est un outil de communication gratuit (comme dans le prix et la liberté). Il est conçu dans un souci de sécurité et de confidentialité. -### Features +### Caractéristiques -- Fully open source (licensed under GPL v2) -- Peer-to-peer -- Encrypted (via WebRTC) -- Serverless -- Ephemeral -- Decentralized +- Entièrement open source (sous licence GPL v2) +- D'égal à égal +- Chiffré (via WebRTC) +- Sans serveur +- Éphémère +- Décentralisé -**Version incluse :** 1.0~ynh6 +**Version incluse :** 1.0~ynh7 **Démo :** https://chitchatter.im/ diff --git a/conf/nginx.conf b/conf/nginx.conf index 6b09163..2bff29e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,4 +4,9 @@ location __PATH__/ { alias __INSTALL_DIR__/build/; index index.html; + + try_files $uri /index.html; + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..59cbaa3 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,10 @@ +Chitchatter est un outil de communication gratuit (comme dans le prix et la liberté). Il est conçu dans un souci de sécurité et de confidentialité. + +### Caractéristiques + +- Entièrement open source (sous licence GPL v2) +- D'égal à égal +- Chiffré (via WebRTC) +- Sans serveur +- Éphémère +- Décentralisé \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 7b3f428..26e2130 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Chitchatter" description.en = "Peer-to-peer chat that is serverless, decentralized, and ephemeral" description.fr = "Chat peer-to-peer sans serveur, décentralisée et éphémère" -version = "1.0~ynh6" +version = "1.0~ynh7" maintainers = ["eric_G"] @@ -16,7 +16,7 @@ demo = "https://chitchatter.im/" code = "https://github.com/jeremyckahn/chitchatter" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/_common.sh b/scripts/_common.sh index a8483bf..b2ea695 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,8 +7,8 @@ #================================================= # nodejs version -nodejs_version=16 -version_commit=94ed09c90fdb5ec6007c5b615de59e6b3ba0099a +nodejs_version=18 +version_commit=2c29674a483a7e9e481710e135d0dd5ae8ce56b2 #================================================= # PERSONAL HELPERS