Bozhidar Slaveykov 1 year ago
parent
commit
c981f5a4bf
2 changed files with 19 additions and 6 deletions
  1. 19 2
      update/update-web-panel.sh
  2. 0 4
      web/db-migrate.sh

+ 19 - 2
update/update-web-panel.sh

@@ -31,7 +31,24 @@ cp -r /usr/local/phyre/update/web-panel-latest/lang /usr/local/phyre/web/lang
 cp -r /usr/local/phyre/update/web-panel-latest/Modules /usr/local/phyre/web/Modules
 cp -r /usr/local/phyre/update/web-panel-latest/thirdparty /usr/local/phyre/web/thirdparty
 
-chmod +x /usr/local/phyre/web/db-migrate.sh
-/usr/local/phyre/web/db-migrate.sh
+
+cd /usr/local/phyre/web
+
+
+
+PHYRE_PHP=/usr/local/phyre/php/bin/php
+
+$PHYRE_PHP -v
+$PHYRE_PHP -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+$PHYRE_PHP ./composer-setup.php
+$PHYRE_PHP -r "unlink('composer-setup.php');"
+
+rm -rf composer.lock
+COMPOSER_ALLOW_SUPERUSER=1 $PHYRE_PHP composer.phar i --no-interaction --no-progress
+COMPOSER_ALLOW_SUPERUSER=1 $PHYRE_PHP composer.phar dump-autoload --no-interaction --no-progress
+
+
+chmod +x ./db-migrate.sh
+./db-migrate.sh
 
 service phyre restart

+ 0 - 4
web/db-migrate.sh

@@ -1,9 +1,5 @@
 PHYRE_PHP=/usr/local/phyre/php/bin/php
 
-rm -rf composer.lock
-$PHYRE_PHP composer.phar i --no-interaction --no-progress
-$PHYRE_PHP composer.phar dump-autoload --no-interaction --no-progress
-
 $PHYRE_PHP artisan migrate
 
 #$PHYRE_PHP artisan l5-swagger:generate