diff --git a/manifest.toml b/manifest.toml index 4c56a58..9a9dbe7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ admindoc = "https://jupyterlab.readthedocs.io/en/stable/" code = "https://github.com/jupyterhub/jupyterhub" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 7bebaf9..022663d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ nodejs_version="18" jupyterlab_upstream_version() { upstream_repository=$(ynh_read_manifest - upstream_url=$(ynh_read_manifest + upstream_url=$(ynh_read_manifest) upstream_commit=$(echo "$upstream_url" | sed -e "s|^${upstream_repository}/archive/refs/tags/\(.*\)\.tar\.gz|\1|") echo "$upstream_commit" } diff --git a/scripts/install b/scripts/install index b82fbcd..572cf37 100644 --- a/scripts/install +++ b/scripts/install @@ -50,16 +50,13 @@ path_no_slash=${path%/} ynh_config_add --template="jupyterhub_config.py" --destination="$install_dir/config/jupyterhub_config.py" ynh_config_add --template="jupyter_notebook_config.py" --destination="$install_dir/config/jupyter_notebook_config.py" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add "$app" --description="Console environment for running Python code" --log="/var/log/$app/$app.log" diff --git a/scripts/remove b/scripts/remove index 90a0efb..4648d1f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,15 +12,12 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Removing system configurations related to $app..." -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_hide_warnings yunohost service status "$app" >/dev/null; then yunohost service remove "$app" fi -# Remove the dedicated systemd config ynh_config_remove_systemd -# Remove the dedicated NGINX config ynh_config_remove_nginx ynh_nodejs_remove diff --git a/scripts/restore b/scripts/restore index dc61957..48a467a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -4,7 +4,6 @@ # IMPORT GENERIC HELPERS #================================================= -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -31,7 +30,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir" #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 1f97983..879862c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -59,7 +59,6 @@ path_no_slash=${path%/} ynh_config_add --template="jupyterhub_config.py" --destination="$install_dir/config/jupyterhub_config.py" ynh_config_add --template="jupyter_notebook_config.py" --destination="$install_dir/config/jupyter_notebook_config.py" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir" #================================================= # SETUP SYSTEMD #================================================= @@ -67,7 +66,6 @@ ynh_script_progression "Upgrading systemd configuration..." ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add "$app" --description="Console environment for running Python code" --log="/var/log/$app/$app.log"