From 1c686c9ccbbe93e2c8663ec369aa0002df000efc Mon Sep 17 00:00:00 2001 From: Sergei Solovev Date: Sun, 10 Mar 2024 00:09:49 +0300 Subject: [PATCH] The panel installation has been updated Previously: The installation took place from the site. Now: The installation takes place from the repository on GitHub --- install.sh | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/install.sh b/install.sh index d4d8a6c..37a6fbf 100644 --- a/install.sh +++ b/install.sh @@ -525,20 +525,25 @@ EOF continue fi - # Установка EngineGP - # Создание временной папки - sudo mkdir /tmp/enginegp >> $logsINST 2>&1 + # Установка и настрока composer + if [ ! -f "/usr/local/bin/composer" ]; then + echo "===================================" >> $logsINST 2>&1 + echo "composer не установлен. Выполняется установка..." | tee -a $logsINST + echo "===================================" >> $logsINST 2>&1 + curl -sSL https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer >> $logsINST 2>&1 + else + echo "===================================" >> $logsINST 2>&1 + echo "composer уже установлен в системе." | tee -a $logsINST + echo "===================================" >> $logsINST 2>&1 + fi - # Закачиваем и распаковываем панель - if [ ! -f "/var/www/enginegp/index.php" ]; then + # Установка EngineGP + if [ ! -d "/var/www/enginegp" ]; then echo "===================================" >> $logsINST 2>&1 echo "enginegp не установлен. Выполняется установка..." | tee -a $logsINST echo "===================================" >> $logsINST 2>&1 - sudo curl -SL -o /tmp/enginegp/enginegp.zip "$resURL/$resEGP/$verEGP/$verEGP.zip" >> $logsINST 2>&1 - sudo unzip /tmp/enginegp/enginegp.zip -d /tmp/enginegp/ >> $logsINST 2>&1 - sudo rsync -av /tmp/enginegp/EngineGP-*/. /var/www/enginegp/ >> $logsINST 2>&1 - sudo rm /tmp/enginegp/enginegp.zip >> $logsINST 2>&1 - sudo rm -r /tmp/enginegp/EngineGP-* >> $logsINST 2>&1 + sudo git clone https://github.com/EngineGPDev/EngineGP.git /var/www/enginegp >> $logsINST 2>&1 + sudo COMPOSER_ALLOW_SUPERUSER=1 composer install --working-dir=/var/www/enginegp >> $logsINST 2>&1 sed -i "s/IPADDR/$sysIP/g" /var/www/enginegp/system/data/config.php >> $logsINST 2>&1 sed -i "s/enginegp/$dbEgpSQL/g" /var/www/enginegp/system/data/mysql.php >> $logsINST 2>&1 sed -i "s/root/$usrEgpSQL/g" /var/www/enginegp/system/data/mysql.php >> $logsINST 2>&1 @@ -553,21 +558,6 @@ EOF continue fi - # Установка и настрока composer - if [ ! -d "/var/www/enginegp/vendor" ]; then - echo "===================================" >> $logsINST 2>&1 - echo "composer не установлен. Выполняется установка..." | tee -a $logsINST - echo "===================================" >> $logsINST 2>&1 - curl -o /tmp/enginegp/composer-setup.php https://getcomposer.org/installer >> $logsINST 2>&1 - php$verPHP /tmp/enginegp/composer-setup.php --install-dir=/usr/local/bin --filename=composer >> $logsINST 2>&1 - sudo rm /tmp/enginegp/composer-setup.php >> $logsINST 2>&1 - sudo composer install --no-interaction --working-dir=/var/www/enginegp >> $logsINST 2>&1 - else - echo "===================================" >> $logsINST 2>&1 - echo "composer уже установлен в системе." | tee -a $logsINST - echo "===================================" >> $logsINST 2>&1 - fi - # Выставляем права на каталог sudo chown -R www-data:www-data /var/www/enginegp >> $logsINST 2>&1 sudo chmod -R 755 /var/www/enginegp >> $logsINST 2>&1