aboutsummaryrefslogtreecommitdiff
path: root/scripts/install
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2019-08-04 19:24:56 +0200
committerGitHub <noreply@github.com>2019-08-04 19:24:56 +0200
commitf273be5f8d9d1d7f7e00e4226bddccb508e7af0d (patch)
tree9009f7849e9fd3bfe7c5729d96837787b05725cc /scripts/install
parent8dc3494bfef5b9d27b63168b18018e7ae64f27b2 (diff)
parent5c325134b146e75b388f83df5730b988d096fdc4 (diff)
downloadmastodon_ynh-f273be5f8d9d1d7f7e00e4226bddccb508e7af0d.tar.gz
mastodon_ynh-f273be5f8d9d1d7f7e00e4226bddccb508e7af0d.tar.bz2
mastodon_ynh-f273be5f8d9d1d7f7e00e4226bddccb508e7af0d.zip
Merge branch 'testing' into ldap
Diffstat (limited to 'scripts/install')
-rw-r--r--scripts/install3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/install b/scripts/install
index 3a4b517..55b1480 100644
--- a/scripts/install
+++ b/scripts/install
@@ -43,8 +43,7 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
final_path=/var/www/$app
test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-if [ "$admin" != "package_checker" ]
-then
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
# TODO : to be factorized into a helper someday ? ;)
MEM=$(free | grep "^Mem" | awk '{print $2}')
SWAP=$(free | grep "^Swap" | awk '{print $2}')