1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/cinny_ynh.git synced 2024-09-03 18:16:13 +02:00

Allow installing in subdir again

This commit is contained in:
Salamandar 2021-11-05 14:48:40 +01:00 committed by Salamandar
parent 5a53259a38
commit 81dbc1c612
5 changed files with 6 additions and 29 deletions

View file

@ -1,11 +1,11 @@
;; Test complet ;; Test complet
; Manifest ; Manifest
domain="domain.tld" domain="domain.tld"
path="/" path="/path"
is_public=1 is_public=1
; Checks ; Checks
pkg_linter=1 pkg_linter=1
setup_sub_dir=0 setup_sub_dir=1
setup_root=1 setup_root=1
setup_nourl=0 setup_nourl=0
setup_private=1 setup_private=1
@ -14,7 +14,7 @@
#upgrade=1 from_commit=CommitHash #upgrade=1 from_commit=CommitHash
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
change_url=0 change_url=1
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none

View file

@ -6,7 +6,7 @@
"en": "Matrix client focusing primarily on simple, elegant and secure interface", "en": "Matrix client focusing primarily on simple, elegant and secure interface",
"fr": "Client matrix orienté simplicité, élégance et sécurité" "fr": "Client matrix orienté simplicité, élégance et sécurité"
}, },
"version": "1.5.0~ynh1", "version": "1.5.0~ynh2",
"url": "https://cinny.in", "url": "https://cinny.in",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",
@ -37,12 +37,8 @@
{ {
"name": "path", "name": "path",
"type": "path", "type": "path",
"example": "/", "example": "/cinny",
"default": "/", "default": "/cinny"
"help": {
"en": "Cinny only supports to be installed on / for now.",
"fr": "Cinny ne peut être installé que à la racine pour le moment."
}
}, },
{ {
"name": "is_public", "name": "is_public",

View file

@ -8,14 +8,6 @@
# PERSONAL HELPERS # PERSONAL HELPERS
#================================================= #=================================================
ynh_webpath_is_domain_root () {
local -A args_array=( [p]=path_url= )
local path_url
ynh_handle_getopts_args "$@"
[[ "$path_url" != "/" ]] && [[ "$path_url" != "" ]]
}
#================================================= #=================================================
# EXPERIMENTAL HELPERS # EXPERIMENTAL HELPERS
#================================================= #=================================================

View file

@ -62,12 +62,6 @@ then
change_path=1 change_path=1
fi fi
if ynh_webpath_is_domain_root -p "$new_path"; then
ynh_print_err "Cinny can only be installed on a domain root !"
ynh_die "Aborting."
fi
#================================================= #=================================================
# STANDARD MODIFICATIONS # STANDARD MODIFICATIONS
#================================================= #=================================================

View file

@ -36,11 +36,6 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde
# Register (book) web path # Register (book) web path
if ynh_webpath_is_domain_root -p "$path_url"; then
ynh_print_err "Cinny can only be installed on a domain root !"
ynh_die "Aborting."
fi
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
#================================================= #=================================================