diff --git a/manifest.toml b/manifest.toml index c0da4c4..f566d16 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ admindoc = "https://docs.framasoft.org/fr/jitsimeet/mumble.html" code = "https://github.com/Johni0702/mumble-web/" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/_common.sh b/scripts/_common.sh index 305b4ab..ee7757d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,5 +4,4 @@ # COMMON VARIABLES AND CUSTOM HELPERS #================================================= -# NodeJS version nodejs_version="14" diff --git a/scripts/install b/scripts/install index 2c962ce..1727554 100644 --- a/scripts/install +++ b/scripts/install @@ -20,20 +20,16 @@ ynh_nodejs_install #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source ynh_setup_source --dest_dir="$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 | chmod -R o-rwx "$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:www-data" "$install_dir" #================================================= # BUILD CODE #================================================= ynh_script_progression "Building Mumble web client..." pushd "$install_dir" - - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install --save --loglevel warn - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build + ynh_hide_warnings ynh_exec_as_app env "$ynh_node_load_PATH" $ynh_npm install --save --loglevel warn + ynh_hide_warnings ynh_exec_as_app env "$ynh_node_load_PATH" $ynh_npm run build popd #================================================= @@ -42,18 +38,14 @@ popd ynh_script_progression "Adding $app's configuration..." ynh_config_add --template="config.local.js" --destination="$install_dir/dist/config.local.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/dist/config.local.js" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app" "$install_dir/dist/config.local.js" #================================================= # 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="Mumble web client" --log="/var/log/$app/$app.log" diff --git a/scripts/remove b/scripts/remove index 5a4d59c..e4b1eec 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,19 +10,15 @@ 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 ynh_script_progression "Removing $app service integration..." yunohost service remove $app fi -# Remove the dedicated systemd config ynh_config_remove_systemd -# Remove the dedicated nginx config ynh_config_remove_nginx -# Remove NodeJS ynh_nodejs_remove #================================================= diff --git a/scripts/restore b/scripts/restore index 2cec786..7228b79 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,8 +17,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 | chmod -R o-rwx "$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:www-data" "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e68a682..bb1b5b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,19 +22,16 @@ ynh_nodejs_install #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --full_replace --keep="dist/config.local.js" -#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 | chmod -R o-rwx "$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:www-data" "$install_dir" #================================================= # BUILD CODE #================================================= ynh_script_progression "Building Mumble web client..." pushd "$install_dir" - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install --save --loglevel warn - ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm run build + ynh_hide_warnings ynh_exec_as_app env "$ynh_node_load_PATH" $ynh_npm install --save --loglevel warn + ynh_hide_warnings ynh_exec_as_app env "$ynh_node_load_PATH" $ynh_npm run build popd #================================================= @@ -42,10 +39,8 @@ popd #================================================= ynh_script_progression "Upgrading 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="Mumble web client" --log="/var/log/$app/$app.log"