YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup ynh_spawn_app_shell

Browse source
This commit is contained in:
tituspijean 2023-05-24 22:08:51 +00:00
parent ed1b5e567b
commit a47e491869
No known key found for this signature in database
GPG key ID: EF3B0D7CC0A94720
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
helpers/apps
View file

@ -152,7 +152,7 @@ ynh_spawn_app_shell() {
fi fi
# Make sure the app has an install_dir setting # Make sure the app has an install_dir setting
local install_dir="$(yunohost app setting $app install_dir)" local install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
if [ -z "$install_dir" ] if [ -z "$install_dir" ]
then then
ynh_print_err --message="$app has no install_dir setting (does it use packaging format >=2?)" ynh_print_err --message="$app has no install_dir setting (does it use packaging format >=2?)"
@ -185,13 +185,11 @@ ynh_spawn_app_shell() {
set +a set +a
fi fi
# Open the app shell # cd into the WorkingDirectory set in the service, or default to the install_dir
local env_dir = $(systemctl show $app.service -p "WorkingDirectory" --value) local env_dir = $(systemctl show $app.service -p "WorkingDirectory" --value)
if [[ $env_dir = "" ]]; [ -z $env_dir ] && env_dir=$install_dir;
then
env_dir = $install_dir
fi
cd $env_dir cd $env_dir
# Spawn the app shell
su -s /bin/bash $app su -s /bin/bash $app
} }