Bläddra i källkod

The one time update of configuration.php was planed, future updates should follow under using of sed.

Raphael Schneeberger 5 år sedan
förälder
incheckning
afd5715e45
3 ändrade filer med 7 tillägg och 12 borttagningar
  1. 1 8
      func/upgrade.sh
  2. 6 1
      install/upgrade/versions/latest.sh
  3. 0 3
      src/deb/hestia/postinst

+ 1 - 8
func/upgrade.sh

@@ -159,7 +159,7 @@ upgrade_start_routine() {
         upgrade_refresh_config
         upgrade_refresh_config
     fi
     fi
 
 
-    # Upgrade to Version 1.2.0
+    # Upgrade to Version 1.1.2
     if [ $VERSION = "1.1.1" ]; then
     if [ $VERSION = "1.1.1" ]; then
         source $HESTIA/install/upgrade/versions/latest.sh
         source $HESTIA/install/upgrade/versions/latest.sh
         VERSION="$new_version"
         VERSION="$new_version"
@@ -214,13 +214,6 @@ upgrade_phpmyadmin() {
     fi
     fi
 }
 }
 
 
-upgrade_fm_configuration() {
-    if [ -e "$HESTIA/web/fm/configuration.php" ]; then
-        echo "(*) Updating File Manager Configuration..."
-        cp -f $HESTIA_INSTALL_DIR/filemanager/filegator/configuration.php $HESTIA/web/fm/configuration.php
-    fi
-}
-
 upgrade_get_version() {
 upgrade_get_version() {
     # Retrieve new version number for Hestia Control Panel from .deb package
     # Retrieve new version number for Hestia Control Panel from .deb package
     new_version=$(dpkg -l | awk '$2=="hestia" { print $3 }')
     new_version=$(dpkg -l | awk '$2=="hestia" { print $3 }')

+ 6 - 1
install/upgrade/versions/latest.sh

@@ -134,9 +134,14 @@ fi
 
 
 # Install Filegator FileManager during upgrade
 # Install Filegator FileManager during upgrade
 if [ ! -e "$HESTIA/web/fm/configuration.php" ]; then
 if [ ! -e "$HESTIA/web/fm/configuration.php" ]; then
-    echo "(*) Installing File Manager..."
+    echo "(*) Configuring Filegator FileManager..."
+
     # Install the FileManager
     # Install the FileManager
     source $HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
     source $HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
+else 
+    echo "(*) Update Filegator Configuration..."
+    # Update configuration.php
+    cp -f $HESTIA_INSTALL_DIR/filemanager/filegator/configuration.php $HESTIA/web/fm/configuration.php
 fi
 fi
 
 
 # Enable nginx module loading
 # Enable nginx module loading

+ 0 - 3
src/deb/hestia/postinst

@@ -37,9 +37,6 @@ upgrade_start_routine
 # Upgrade phpMyAdmin if applicable
 # Upgrade phpMyAdmin if applicable
 upgrade_phpmyadmin
 upgrade_phpmyadmin
 
 
-# Ensure that File Manager configuration is up-to-date
-upgrade_fm_configuration
-
 # Set new version number in hestia.conf
 # Set new version number in hestia.conf
 upgrade_set_version
 upgrade_set_version