Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove --experimental

Browse Source
This commit is contained in:
VirtuBox
2019-03-07 12:36:32 +01:00
parent 5eacbf858b
commit 42092d7885
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install
View File

@@ -27,7 +27,7 @@ TPUT_FAIL=$(tput setaf 1)
wo_lib_echo () { wo_lib_echo () {
TPUT_ECHO=$(tput setaf 4) TPUT_ECHO=$(tput setaf 4)
echo "${TPUT_ECHO}${*}${TPUT_RESET}" echo "${*}${TPUT_RESET}"
} }
wo_lib_echo_info() wo_lib_echo_info()
@@ -123,17 +123,17 @@ fi
#### ####
wo_install_dep() wo_install_dep()
{ {
echo -ne ' Installing dependencies [..]\r' echo -ne "${TPUT_ECHO}Installing dependencies ${TPUT_RESET}[..]\r"
if { if {
if [ "$wo_linux_distro" == "Ubuntu" ]; then if [ "$wo_linux_distro" == "Ubuntu" ]; then
apt-get -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 > /dev/null 2>&1 apt-get -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 > /dev/null 2>&1
else else
apt-get -y install build-essential curl gzip dirmngr python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 > /dev/null 2>&1 apt-get -y install build-essential curl gzip dirmngr python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 > /dev/null 2>&1
fi fi
}; then echo -ne ' Installing dependencies [OK]\r' }; then echo -ne "${TPUT_ECHO}Installing dependencies ${TPUT_RESET}[OK]\r"
echo -ne '\n' echo -ne '\n'
else else
echo -e " Installing dependencies [FAIL]" echo -e "${TPUT_FAIL}Installing dependencies ${TPUT_RESET}[FAIL]"
echo -ne '\n' echo -ne '\n'
fi fi
locale-gen en &>> /dev/null locale-gen en &>> /dev/null
@@ -695,7 +695,6 @@ else
fi fi
else else
# 3 - Fresh WO setup # 3 - Fresh WO setup
wo_lib_echo "Installing depedencies" | tee -ai $wo_install_log
wo_install_dep | tee -ai $wo_install_log wo_install_dep | tee -ai $wo_install_log
wo_lib_echo "Installing WordOps $wo_branch" | tee -ai $wo_install_log wo_lib_echo "Installing WordOps $wo_branch" | tee -ai $wo_install_log
wo_install | tee -ai $wo_install_log wo_install | tee -ai $wo_install_log

8
wo/cli/plugins/site.py
View File

@@ -1180,7 +1180,7 @@ class WOSiteUpdateController(CementBaseController):
if pargs.hhvm == "on" or pargs.letsencrypt == "on" or pargs.php73 == "on": if pargs.hhvm == "on" or pargs.letsencrypt == "on" or pargs.php73 == "on":
if pargs.php73 == "on": if pargs.php73 == "on":
if (not pargs.experimental): if pargs.experimental:
Log.info( Log.info(
self, "Do you wish to enable PHP 7.3 now for {0}?".format(wo_domain)) self, "Do you wish to enable PHP 7.3 now for {0}?".format(wo_domain))
@@ -1197,7 +1197,7 @@ class WOSiteUpdateController(CementBaseController):
php73 = True php73 = True
if pargs.hhvm == "on": if pargs.hhvm == "on":
if (not pargs.experimental): if pargs.experimental:
Log.info(self, "HHVM is experimental feature and it may not" Log.info(self, "HHVM is experimental feature and it may not"
" work with all plugins of your site.\nYou can " " work with all plugins of your site.\nYou can "
"disable it by passing --hhvm=off later.\nDo you wish" "disable it by passing --hhvm=off later.\nDo you wish"
@@ -1218,7 +1218,7 @@ class WOSiteUpdateController(CementBaseController):
if pargs.letsencrypt == "on": if pargs.letsencrypt == "on":
if (not pargs.experimental): if pargs.experimental:
if oldsitetype in ['wpsubdomain']: if oldsitetype in ['wpsubdomain']:
Log.warn( Log.warn(
@@ -1241,7 +1241,7 @@ class WOSiteUpdateController(CementBaseController):
letsencrypt = True letsencrypt = True
if pargs.wpredis and data['currcachetype'] != 'wpredis': if pargs.wpredis and data['currcachetype'] != 'wpredis':
if (not pargs.experimental): if pargs.experimental:
Log.info(self, "Redis is experimental feature and it may not" Log.info(self, "Redis is experimental feature and it may not"
" work with all plugins of your site.\nYou can " " work with all plugins of your site.\nYou can "
"disable it by changing cache type later.\nDo you wish" "disable it by changing cache type later.\nDo you wish"