From 89b64b7d8022a51e9d5c5e647e6fd6abc12de46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Fri, 22 Mar 2024 00:02:23 +0100
Subject: [PATCH] Fix install

---
 scripts/_common.sh | 3 +--
 scripts/install    | 2 +-
 scripts/upgrade    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ca4329f..bb10598 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -10,13 +10,12 @@ nodejs_version="18"
 # PERSONAL HELPERS
 #=================================================
 
-upstream_version() {
+jupyterlab_upstream_version() {
     upstream_repository=$(ynh_read_manifest --manifest_key='upstream.code')
     upstream_url=$(ynh_read_manifest --manifest_key='resources.sources.main.url')
     upstream_commit=$(echo "$upstream_url" | sed -e "s|^${upstream_repository}/archive/refs/tags/\(.*\)\.tar\.gz|\1|")
     echo "$upstream_commit"
 }
-jupyterlab_version="$(upstream_version)"
 
 #=================================================
 # EXPERIMENTAL HELPERS
diff --git a/scripts/install b/scripts/install
index f4d7d19..663f07d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -25,7 +25,7 @@ ynh_script_progression --message="Building app..." --weight=5
 python3 -m venv "$install_dir/venv"
 
 ynh_exec_warn_less "$install_dir/venv/bin/python3" pip install \
-    jupyterlab=="$jupyterlab_version" \
+    jupyterlab=="$(jupyterlab_upstream_version)" \
     jupyterhub \
     jupyter_collaboration \
     notebook \
diff --git a/scripts/upgrade b/scripts/upgrade
index eccc67c..af2e871 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -33,7 +33,7 @@ ynh_secure_remove --file="$install_dir/.venv"
 python3 -m venv "$install_dir/venv"
 
 ynh_exec_warn_less "$install_dir/venv/bin/python3" pip install \
-    jupyterlab=="$jupyterlab_version" \
+    jupyterlab=="$(jupyterlab_upstream_version)" \
     jupyterhub \
     jupyter_collaboration \
     notebook \