update travis

This commit is contained in:
VirtuBox
2019-10-30 16:14:14 +01:00
parent 9b3891409c
commit 0b6e627306
4 changed files with 9 additions and 14 deletions

View File

@@ -999,10 +999,7 @@ class WOSiteUpdateController(CementBaseController):
check_ssl = check_site.is_ssl
check_php_version = check_site.php_version
if check_php_version == "7.3":
old_php73 = True
else:
old_php73 = False
old_php73 = bool(check_php_version == "7.3")
if (pargs.password and not (pargs.html or
pargs.php or pargs.php73 or pargs.mysql or
@@ -1378,7 +1375,7 @@ class WOSiteUpdateController(CementBaseController):
if 'proxy' in data.keys() and data['proxy']:
updateSiteInfo(self, wo_domain, stype=stype, cache=cache,
ssl=True if check_site.is_ssl else False)
ssl=(bool(check_site.is_ssl)))
Log.info(self, "Successfully updated site"
" http://{0}".format(wo_domain))
return 0

View File

@@ -45,9 +45,6 @@ class WOUpdateController(CementBaseController):
pargs = self.app.pargs
filename = "woupdate" + time.strftime("%Y%m%d-%H%M%S")
wo_current = WOVar.wo_version
wo_latest = WODownload.latest_release(self, "WordOps/WordOps")
install_args = ""
if pargs.mainline or pargs.beta:
wo_branch = "mainline"
@@ -64,6 +61,8 @@ class WOUpdateController(CementBaseController):
if ((not pargs.force) and (not pargs.travis) and
(not pargs.mainline) and (not pargs.beta) and
(not pargs.branch)):
wo_current = WOVar.wo_version
wo_latest = WODownload.latest_release(self, "WordOps/WordOps")
if wo_current == wo_latest:
Log.error(
self, "WordOps {0} is already installed"
@@ -78,9 +77,7 @@ class WOUpdateController(CementBaseController):
"update script"]])
if os.path.isfile('install'):
Log.info(self, "updating WordOps from local install\n"
"Latest public release = {0}".format(wo_latest))
Log.info(self, "updating WordOps from local install\n")
try:
Log.info(self, "updating WordOps, please wait...")
os.system("/bin/bash install --travis")