YunoHost-Apps/glowingbear_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/glowingbear_ynh.git synced 2024-09-03 18:36:20 +02:00
Code Issues Activity Actions

Updates ynh_normalize_path

Browse source
This commit is contained in:
jodeko 2017-11-16 23:34:34 +01:00
parent c5a3bfef03
commit 44a4f732fb
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/install
View file

@ -12,34 +12,18 @@ app_config_get() {
| cut --delimiter== --fields=2 | cut --delimiter== --fields=2
} }
#
# With reference to https://github.com/YunoHost/yunohost/pull/234/files
# TODO: remove me ynh_normalize_path is in stable
#
ynh_normalize_path() {
local path=$1
if [ "${path:0:1}" != "/" ]; then
path="/$path"
fi
if [ "${path:${#path}-1}" == "/" ] && [ ${#path} -gt 1 ]; then
path="${path:0:${#path}-1}"
fi
echo $path
}
main() { main() {
ynh_abort_if_errors ynh_abort_if_errors
local app=$YNH_APP_INSTANCE_NAME local app=$YNH_APP_INSTANCE_NAME
local is_public=$YNH_APP_ARG_IS_PUBLIC local is_public=$YNH_APP_ARG_IS_PUBLIC
local domain=$YNH_APP_ARG_DOMAIN local domain=$YNH_APP_ARG_DOMAIN
local path=$(ynh_normalize_path $YNH_APP_ARG_PATH) local path=$YNH_APP_ARG_PATH
local deploy_path=/var/www/$app local deploy_path=/var/www/$app
local app_config=../conf/app.src #should we make this a convention? local app_config=../conf/app.src #should we make this a convention?
local nginx_config_template=../conf/nginx.conf local nginx_config_template=../conf/nginx.conf
local url=$domain$path local url=$domain$path
local path=$(ynh_normalize_url_path $path)
ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app is_public $is_public
ynh_app_setting_set $app domain $domain ynh_app_setting_set $app domain $domain