fix extplorer install

This commit is contained in:
VirtuBox
2019-04-23 19:23:16 +02:00
parent 9de375ef58
commit 51963091a4

View File

@@ -1149,14 +1149,14 @@ class WOStackController(CementBaseController):
for x in packages): for x in packages):
if not os.path.exists('{0}22222/htdocs/files' if not os.path.exists('{0}22222/htdocs/files'
.format(WOVariables.wo_webroot)): .format(WOVariables.wo_webroot)):
os.makedirs('{0}22222/htdocs/files'
.format(WOVariables.wo_webroot))
Log.debug(self, "Extracting explorer.tar.gz " Log.debug(self, "Extracting explorer.tar.gz "
"to location {0}22222/htdocs/" "to location {0}22222/htdocs/files"
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot))
WOExtract.extract(self, '/tmp/extplorer.tar.gz', WOExtract.extract(self, '/tmp/extplorer.tar.gz',
'{0}22222/htdocs/files' '/tmp/')
.format(WOVariables.wo_webroot)) shutil.move('/tmp/extplorer-2.1.11/',
'{0}22222/htdocs/files'
.format(WOVariables.wo_webroot))
Log.debug(self, "Setting Privileges to " Log.debug(self, "Setting Privileges to "
"{0}22222/htdocs/files" "{0}22222/htdocs/files"
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot))
@@ -1439,11 +1439,16 @@ class WOStackController(CementBaseController):
# PHPMYADMIN # PHPMYADMIN
if self.app.pargs.phpmyadmin: if self.app.pargs.phpmyadmin:
Log.debug(self, "Setting packages variable for phpMyAdmin ") Log.debug(self, "Setting packages variable for phpMyAdmin ")
packages = packages + [["https://github.com/phpmyadmin/" if (not self.app.pargs.composer):
"phpmyadmin/archive/STABLE.tar.gz", packages = packages + [["https://github.com/phpmyadmin/"
"/tmp/pma.tar.gz", "phpMyAdmin"], "phpmyadmin/archive/STABLE.tar.gz",
["https://getcomposer.org/installer", "/tmp/pma.tar.gz", "phpMyAdmin"],
"/tmp/composer-install", "Composer"]] ["https://getcomposer.org/installer",
"/tmp/composer-install", "Composer"]]
else:
packages = packages + [["https://github.com/phpmyadmin/"
"phpmyadmin/archive/STABLE.tar.gz",
"/tmp/pma.tar.gz", "phpMyAdmin"]]
# Composer # Composer
if self.app.pargs.composer: if self.app.pargs.composer:
Log.debug(self, "Setting packages variable for Composer ") Log.debug(self, "Setting packages variable for Composer ")