From f230b12eae83bb61c95d8dff526d45e0ca3b204d Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Tue, 28 Apr 2020 19:43:29 +0200
Subject: [PATCH 1/2] Fix permissions

---
 scripts/install | 2 +-
 scripts/restore | 4 ++--
 scripts/upgrade | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index d84d915..ab70caf 100644
--- a/scripts/install
+++ b/scripts/install
@@ -161,7 +161,7 @@ ynh_store_file_checksum --file="$final_path/config/jupyter_notebook_config.py"
 
 # Set permissions to app files
 chown -R root: $final_path/
-chown -R $admin: $final_path/.venv/lib
+chown -R $admin: $final_path/.venv/
 
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
diff --git a/scripts/restore b/scripts/restore
index c523967..38823a0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -62,8 +62,8 @@ ynh_restore_file --origin_path="$final_path"
 #=================================================
 
 # Restore permissions on app files
-chown -R $admin: $final_path/
-chmod -R 755 $final_path/.venv/
+chown -R root: $final_path/
+chown -R $admin: $final_path/.venv/
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 826461e..544245a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -170,8 +170,8 @@ ynh_add_systemd_config
 #=================================================
 
 # Set permissions on app files
-chown -R $admin: $final_path/
-chmod -R 755 $final_path/.venv/
+chown -R root: $final_path/
+chown -R $admin: $final_path/.venv/
 
 #=================================================
 # SETUP SSOWAT

From 4bd5671691811231fc77db9aa38689224f35d3e6 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Tue, 28 Apr 2020 19:44:03 +0200
Subject: [PATCH 2/2] Use _common.sh to specify jupyterlab version

---
 scripts/_common.sh           | 4 +++-
 scripts/install              | 2 --
 scripts/upgrade              | 2 --
 scripts/upgrade.d/upgrade.sh | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 scripts/upgrade.d/upgrade.sh

diff --git a/scripts/_common.sh b/scripts/_common.sh
index a0d2a8c..51dac8e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,9 @@
 # dependencies used by the app
 pkg_dependencies="python3-pip libffi-dev"
 
-nodejs_version=10
+nodejs_version="10"
+
+jupyterlab_version="2.1.1"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index ab70caf..56447ad 100644
--- a/scripts/install
+++ b/scripts/install
@@ -93,8 +93,6 @@ ynh_script_progression --message="Setting up source files..." --weight=64
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 
-source ./upgrade.d/upgrade.sh
-
 mkdir -p $final_path
 
 pushd $final_path
diff --git a/scripts/upgrade b/scripts/upgrade
index 544245a..862539d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -110,8 +110,6 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=160
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	source ./upgrade.d/upgrade.sh
-
 	mkdir -p $final_path
 
 	pushd $final_path
diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.sh
deleted file mode 100644
index 4f92d7d..0000000
--- a/scripts/upgrade.d/upgrade.sh
+++ /dev/null
@@ -1 +0,0 @@
-jupyterlab_version="2.1.1"