Skip to content

Commit c45ceca

Browse files
author
gau1991
committed
Added autocompletion for Experimental features, Also, fixed #571, softlink creation for proxy sites
1 parent 9053f45 commit c45ceca

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

config/bash_completion.d/ee_auto.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ _ee_complete()
7474
# HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
7575
"install" | "purge" | "remove" )
7676
COMPREPLY=( $(compgen \
77-
-W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
77+
-W "--pagespeed --web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
7878
-- $cur) )
7979
;;
8080
"upgrade" )
@@ -235,9 +235,9 @@ _ee_complete()
235235

236236
"--pagespeed" | "--hhvm")
237237
if [ ${COMP_WORDS[2]} == "create" ]; then
238-
retlist="--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed"
238+
retlist="--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --experimenal"
239239
elif [ ${COMP_WORDS[2]} == "update" ]; then
240-
retlist="--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off"
240+
retlist="--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --experimenal"
241241
else
242242
retlist=""
243243
fi

ee/cli/plugins/site.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class Meta:
362362
dict(help="create proxy for site", nargs='+')),
363363
(['--experimental'],
364364
dict(help="Enable Experimenal packages without prompt",
365-
action='store_true'))),
365+
action='store_true')),
366366
]
367367

368368
@expose(hide=True)
@@ -1048,7 +1048,7 @@ def doupdatesite(self, pargs):
10481048
pagespeed = True
10491049
else:
10501050
data['pagespeed'] = True
1051-
pagespeed = False
1051+
pagespeed = True
10521052

10531053
if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
10541054
(stype == oldsitetype and cache == oldcachetype)):

ee/cli/plugins/site_functions.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,16 @@ def setupdomain(self, data):
9191
raise SiteError("created nginx configuration failed for site."
9292
" check with `nginx -t`")
9393

94-
if 'proxy' in data.keys() and data['proxy']:
95-
return
9694

9795
# create symbolic link for
9896
EEFileUtils.create_symlink(self, ['/etc/nginx/sites-available/{0}'
9997
.format(ee_domain_name),
10098
'/etc/nginx/sites-enabled/{0}'
10199
.format(ee_domain_name)])
102100

101+
if 'proxy' in data.keys() and data['proxy']:
102+
return
103+
103104
# Creating htdocs & logs directory
104105
Log.info(self, "Setting up webroot \t\t", end='')
105106
try:

0 commit comments

Comments
 (0)