From 4f2154790062c37df7472235598f6a4a9197f36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 15 Aug 2023 19:54:38 +0200
Subject: [PATCH 1/4] Update manifest.toml

---
 manifest.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 7e51cd3..9a1fa40 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -45,10 +45,10 @@ ram.runtime = "50M"
         [resources.sources.main]
         amd64.url = "https://github.com/knadh/listmonk/releases/download/v2.5.1/listmonk_2.5.1_linux_amd64.tar.gz"
         amd64.sha256 = "552bb7cb47d7b55be7b48a4ccc19d69b96491065433dafd8cc6a0f39869e4113"
-        armhf.url = "https://github.com/knadh/listmonk/archive/refs/tags/v2.5.1.tar.gz"
-        armhf.sha256 = "c4ce4e283dd924f1a3df62b1a019dd95a366d13b75a7776e206b3320e1edcd41"
-        arm64.url = "https://github.com/knadh/listmonk/archive/refs/tags/v2.5.1.tar.gz"
-        arm64.sha256 = "c4ce4e283dd924f1a3df62b1a019dd95a366d13b75a7776e206b3320e1edcd41"
+        armhf.url = "https://github.com/knadh/listmonk/releases/download/v2.5.1/listmonk_2.5.1_linux_armv7.tar.gz"
+        armhf.sha256 = "7e7e96d64cd2af96711d8d3db717cfdb5c4b8c9ac3fb78b43a4704a8e5625c99"
+        arm64.url = "https://github.com/knadh/listmonk/releases/download/v2.5.1/listmonk_2.5.1_linux_arm64.tar.gz"
+        arm64.sha256 = "832c5a34ed78446c179ed5423cdbce51d3e51333c1ea6cf11c74b63e0776193a"
         in_subdir = false
 
     [resources.system_user]

From e131a1df1801b7aa0423d78d709aaff3252bee20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 15 Aug 2023 19:57:17 +0200
Subject: [PATCH 2/4] Update upgrade

---
 scripts/upgrade | 41 +++++------------------------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 090b329..de84de2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,43 +34,14 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "arm64" ]
-	then
-		ynh_setup_source --dest_dir="$install_dir/build" --keep="$install_dir/config.toml"
-		# Install Nodejs
-		ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-		# Install Go
-		ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
-		pushd "$install_dir/build"
-			cd listmonk-*
-			# Build the sources
-			ynh_use_go
-			export GOPATH="$install_dir/build/go"
-			export GOCACHE="$install_dir/build/.cache"
-			ynh_use_nodejs
-			make dist
-			mv listmonk ../../
-		popd
-		ynh_remove_go
-		ynh_remove_nodejs
-		ynh_secure_remove --file="$install_dir/build"
-	else
-		ynh_setup_source --dest_dir="$install_dir" --keep="$install_dir/config.toml"
-	fi
+	ynh_setup_source --dest_dir="$install_dir" --keep="$install_dir/config.toml"
+	
 fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x "$install_dir/listmonk"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # DATABASE CONFIGURATION
 #=================================================
@@ -85,14 +56,12 @@ popd
 #=================================================
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=2
 
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="Newsletter and mailing list manager" --log="/var/log/$app/$app.log"
 
 #=================================================

From 1f316957a72f3ba042bbafc932a43e81aa10ade1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 15 Aug 2023 19:58:23 +0200
Subject: [PATCH 3/4] fix

---
 manifest.toml          |   4 -
 scripts/_common.sh     |   4 -
 scripts/install        |  38 +------
 scripts/restore        |   1 -
 scripts/upgrade        |   1 -
 scripts/ynh_install_go | 245 -----------------------------------------
 6 files changed, 1 insertion(+), 292 deletions(-)
 delete mode 100644 scripts/ynh_install_go

diff --git a/manifest.toml b/manifest.toml
index 9a1fa40..6b57871 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -74,9 +74,5 @@ ram.runtime = "50M"
     [resources.apt]
     packages = "postgresql"
 
-    extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
-    extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
-    extras.yarn.packages = "yarn"
-
     [resources.database]
     type = "postgresql"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 22ede99..944a65e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,10 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=16
-
-GO_VERSION="1.20"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 1dc2a4d..c808f27 100755
--- a/scripts/install
+++ b/scripts/install
@@ -7,51 +7,15 @@
 #=================================================
 
 source _common.sh
-source ynh_install_go
 source /usr/share/yunohost/helpers
 
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=12
-
-if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "arm64" ]
-then
-	# Install Nodejs
-	ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-
-	# Install Go
-	ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
-fi
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=3
 
-# Download, check integrity, uncompress and patch the source from app.src
-if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "arm64" ]
-then
-	ynh_setup_source --dest_dir="$install_dir/build"
-	pushd "$install_dir/build"
-		# Change to sources directory
-		cd listmonk-*
-		# Build the sources
-		ynh_use_go
-		export GOPATH="$install_dir/build/go"
-		export GOCACHE="$install_dir/build/.cache"
-		ynh_use_nodejs
-		make dist
-		mv listmonk ../../
-	popd
-	ynh_remove_go
-	ynh_remove_nodejs
-	ynh_secure_remove --file="$install_dir/build"
-else
-	ynh_setup_source --dest_dir="$install_dir"
-fi
+ynh_setup_source --dest_dir="$install_dir"
 
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x "$install_dir/listmonk"
 
diff --git a/scripts/restore b/scripts/restore
index 86c1a34..80bcc27 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x "$install_dir/listmonk"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index de84de2..f724c5a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -7,7 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_install_go
 source /usr/share/yunohost/helpers
 
 #=================================================
diff --git a/scripts/ynh_install_go b/scripts/ynh_install_go
deleted file mode 100644
index a3e210c..0000000
--- a/scripts/ynh_install_go
+++ /dev/null
@@ -1,245 +0,0 @@
-ynh_go_try_bash_extension() {
-  if [ -x src/configure ]; then
-    src/configure && make -C src || {
-      ynh_print_info --message="Optional bash extension failed to build, but things will still work normally."
-    }
-  fi
-}
-
-goenv_install_dir="/opt/goenv"
-go_version_path="$goenv_install_dir/versions"
-# goenv_ROOT is the directory of goenv, it needs to be loaded as a environment variable.
-export GOENV_ROOT="$goenv_install_dir"
-
-# Load the version of Go for an app, and set variables.
-#
-# ynh_use_go has to be used in any app scripts before using Go for the first time.
-# This helper will provide alias and variables to use in your scripts.
-#
-# To use gem or Go, use the alias `ynh_gem` and `ynh_go`
-# Those alias will use the correct version installed for the app
-# For example: use `ynh_gem install` instead of `gem install`
-#
-# With `sudo` or `ynh_exec_as`, use instead the fallback variables `$ynh_gem` and `$ynh_go`
-# And propagate $PATH to sudo with $ynh_go_load_path
-# Exemple: `ynh_exec_as $app $ynh_go_load_path $ynh_gem install`
-#
-# $PATH contains the path of the requested version of Go.
-# However, $PATH is duplicated into $go_path to outlast any manipulation of $PATH
-# You can use the variable `$ynh_go_load_path` to quickly load your Go version
-#  in $PATH for an usage into a separate script.
-# Exemple: $ynh_go_load_path $install_dir/script_that_use_gem.sh`
-#
-#
-# Finally, to start a Go service with the correct version, 2 solutions
-#  Either the app is dependent of Go or gem, but does not called it directly.
-#  In such situation, you need to load PATH
-#    `Environment="__YNH_GO_LOAD_PATH__"`
-#    `ExecStart=__FINALPATH__/my_app`
-#     You will replace __YNH_GO_LOAD_PATH__ with $ynh_go_load_path
-#
-#  Or Go start the app directly, then you don't need to load the PATH variable
-#    `ExecStart=__YNH_GO__ my_app run`
-#     You will replace __YNH_GO__ with $ynh_go
-#
-#
-# one other variable is also available
-#   - $go_path: The absolute path to Go binaries for the chosen version.
-#
-# usage: ynh_use_go
-#
-# Requires YunoHost version 3.2.2 or higher.
-ynh_use_go () {
-    go_version=$(ynh_app_setting_get --app=$app --key=go_version)
-
-    # Get the absolute path of this version of Go
-    go_path="$go_version_path/$go_version/bin"
-
-    # Allow alias to be used into bash script
-    shopt -s expand_aliases
-
-    # Create an alias for the specific version of Go and a variable as fallback
-    ynh_go="$go_path/go"
-    alias ynh_go="$ynh_go"
-
-    # Load the path of this version of Go in $PATH
-    if [[ :$PATH: != *":$go_path"* ]]; then
-        PATH="$go_path:$PATH"
-    fi
-    # Create an alias to easily load the PATH
-    ynh_go_load_path="PATH=$PATH"
-
-    # Sets the local application-specific Go version
-    pushd $install_dir
-        $goenv_install_dir/bin/goenv local $go_version
-    popd
-}
-
-# Install a specific version of Go
-#
-# ynh_install_go will install the version of Go provided as argument by using goenv.
-#
-# This helper creates a /etc/profile.d/goenv.sh that configures PATH environment for goenv
-# for every LOGIN user, hence your user must have a defined shell (as opposed to /usr/sbin/nologin)
-#
-# Don't forget to execute go-dependent command in a login environment
-# (e.g. sudo --login option)
-# When not possible (e.g. in systemd service definition), please use direct path
-# to goenv shims (e.g. $goenv_ROOT/shims/bundle)
-#
-# usage: ynh_install_go --go_version=go_version
-# | arg: -v, --go_version= - Version of go to install.
-#
-# Requires YunoHost version 3.2.2 or higher.
-ynh_install_go () {
-    # Declare an array to define the options of this helper.
-    local legacy_args=v
-    local -A args_array=( [v]=go_version= )
-    local go_version
-    # Manage arguments with getopts
-    ynh_handle_getopts_args "$@"
-
-    # Load goenv path in PATH
-    local CLEAR_PATH="$goenv_install_dir/bin:$PATH"
-
-    # Remove /usr/local/bin in PATH in case of Go prior installation
-    PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
-
-    # Move an existing Go binary, to avoid to block goenv
-    test -x /usr/bin/go && mv /usr/bin/go /usr/bin/go_goenv
-
-    # Install or update goenv
-    goenv="$(command -v goenv $goenv_install_dir/bin/goenv | head -1)"
-    if [ -n "$goenv" ]; then
-        ynh_print_info --message="goenv already seems installed in \`$goenv'."
-        pushd "${goenv%/*/*}"
-            if git remote -v 2>/dev/null | grep "https://github.com/syndbg/goenv.git"; then
-                echo "Trying to update with git..."
-                git pull -q --tags origin master
-                cd ..
-                ynh_go_try_bash_extension
-            fi
-        popd
-    else
-        ynh_print_info --message="Installing goenv with git..."
-        mkdir -p $goenv_install_dir
-        pushd $goenv_install_dir
-            git init -q
-            git remote add -f -t master origin https://github.com/syndbg/goenv.git > /dev/null 2>&1
-            git checkout -q -b master origin/master
-            ynh_go_try_bash_extension
-            goenv=$goenv_install_dir/bin/goenv
-        popd
-    fi
-
-    goenv_latest="$(command -v "$goenv_install_dir"/plugins/*/bin/goenv-latest goenv-latest | head -1)"
-    if [ -n "$goenv_latest" ]; then
-        ynh_print_info --message="\`goenv latest' command already available in \`$goenv_latest'."
-        pushd "${goenv_latest%/*/*}"
-            if git remote -v 2>/dev/null | grep "https://github.com/momo-lab/xxenv-latest.git"; then
-                ynh_print_info --message="Trying to update xxenv-latest with git..."
-                git pull -q origin master
-            fi
-        popd
-    else
-        ynh_print_info --message="Installing xxenv-latest with git..."
-        mkdir -p "${goenv_install_dir}/plugins"
-        git clone -q https://github.com/momo-lab/xxenv-latest.git "${goenv_install_dir}/plugins/xxenv-latest"
-    fi
-
-    # Enable caching
-    mkdir -p "${goenv_install_dir}/cache"
-
-    # Create shims directory if needed
-    mkdir -p "${goenv_install_dir}/shims"
-
-    # Restore /usr/local/bin in PATH
-    PATH=$CLEAR_PATH
-
-    # And replace the old Go binary
-    test -x /usr/bin/go_goenv && mv /usr/bin/go_goenv /usr/bin/go
-
-    # Install the requested version of Go
-    local final_go_version=$(goenv latest --print $go_version)
-    ynh_print_info --message="Installation of Go-$final_go_version"
-    goenv install --skip-existing $final_go_version
-
-    # Store go_version into the config of this app
-    ynh_app_setting_set --app=$YNH_APP_INSTANCE_NAME --key=go_version --value=$final_go_version
-
-    # Cleanup Go versions
-    ynh_cleanup_go
-
-    # Set environment for Go users
-    echo  "#goenv
-export GOENV_ROOT=$goenv_install_dir
-export PATH=\"$goenv_install_dir/bin:$PATH\"
-eval \"\$(goenv init -)\"
-#goenv" > /etc/profile.d/goenv.sh
-
-    # Load the environment
-    eval "$(goenv init -)"
-}
-
-# Remove the version of Go used by the app.
-#
-# This helper will also cleanup Go versions
-#
-# usage: ynh_remove_go
-ynh_remove_go () {
-    local go_version=$(ynh_app_setting_get --app=$YNH_APP_INSTANCE_NAME --key=go_version)
-
-    # Load goenv path in PATH
-    local CLEAR_PATH="$goenv_install_dir/bin:$PATH"
-
-    # Remove /usr/local/bin in PATH in case of Go prior installation
-    PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
-
-    # Remove the line for this app
-    ynh_app_setting_delete --app=$YNH_APP_INSTANCE_NAME --key=go_version
-
-    # Cleanup Go versions
-    ynh_cleanup_go
-}
-
-# Remove no more needed versions of Go used by the app.
-#
-# This helper will check what Go version are no more required,
-# and uninstall them
-# If no app uses Go, goenv will be also removed.
-#
-# usage: ynh_cleanup_go
-ynh_cleanup_go () {
-
-    # List required Go versions
-    local installed_apps=$(yunohost app list | grep -oP 'id: \K.*$')
-    local required_go_versions=""
-    for installed_app in $installed_apps
-    do
-        local installed_app_go_version=$(ynh_app_setting_get --app=$installed_app --key="go_version")
-        if [[ $installed_app_go_version ]]
-        then
-            required_go_versions="${installed_app_go_version}\n${required_go_versions}"
-        fi
-    done
-    
-    # Remove no more needed Go versions
-    local installed_go_versions=$(goenv versions --bare --skip-aliases | grep -Ev '/')
-    for installed_go_version in $installed_go_versions
-    do
-        if ! `echo ${required_go_versions} | grep "${installed_go_version}" 1>/dev/null 2>&1`
-        then
-            ynh_print_info --message="Removing of Go-$installed_go_version"
-            $goenv_install_dir/bin/goenv uninstall --force $installed_go_version
-        fi
-    done
-
-    # If none Go version is required
-    if [[ ! $required_go_versions ]]
-    then
-        # Remove goenv environment configuration
-        ynh_print_info --message="Removing of goenv"
-        ynh_secure_remove --file="$goenv_install_dir"
-        ynh_secure_remove --file="/etc/profile.d/goenv.sh"
-    fi
-}
\ No newline at end of file

From aff42086e2fd95376fa52890049bb8a641007095 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 15 Aug 2023 18:32:22 +0000
Subject: [PATCH 4/4] Auto-update README

---
 README.md    | 4 ++--
 README_fr.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e6eea0d..1cce4eb 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Listmonk is a standalone, self-hosted, newsletter and mailing list manager. It is fast, feature-rich, and packed into a single binary. It uses a PostgreSQL (⩾ v9.4) database as its data store.
+Listmonk is a standalone, self-hosted, newsletter and mailing list manager. It is fast, feature-rich, and packed into a single binary. It uses a PostgreSQL database as its data base.
 
 
-**Shipped version:** 2.4.0~ynh3
+**Shipped version:** 2.5.1~ynh1
 
 **Demo:** https://demo.listmonk.app/
 
diff --git a/README_fr.md b/README_fr.md
index 7dbfbcd..e6d4039 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -16,10 +16,10 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Listmonk is a standalone, self-hosted, newsletter and mailing list manager. It is fast, feature-rich, and packed into a single binary. It uses a PostgreSQL (⩾ v9.4) database as its data store.
+Listmonk est un gestionnaire de newsletter et de liste de diffusion autonome et auto-hébergé. Il est rapide, riche en fonctionnalités et emballé dans un seul binaire. Il utilise une base de données PostgreSQL comme base de données.
 
 
-**Version incluse :** 2.4.0~ynh3
+**Version incluse :** 2.5.1~ynh1
 
 **Démo :** https://demo.listmonk.app/