Browse Source

Fix some parts in phpmyadmin function.

Raphael Schneeberger 7 years ago
parent
commit
8ff9c3b6be
2 changed files with 8 additions and 6 deletions
  1. 4 3
      install/hst-install-debian.sh
  2. 4 3
      install/hst-install-ubuntu.sh

+ 4 - 3
install/hst-install-debian.sh

@@ -1102,15 +1102,16 @@ wget https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-langua
 tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
 
 # Delete file to prevent error
-if [ "$pma_#----------------------------------------------------------#
-#                    Update phpMyAdmin                     #
-v" = '4.8.3' ]; then
+if [ "$pma_v" = '4.8.3' ]; then
     rm -fr /usr/share/phpmyadmin/doc/html
 fi
 
 # Overwrite old files
 cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
 
+# Set config directory
+sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
+
 # Clear Up
 rm -fr phpMyAdmin-$pma_v-all-languages
 rm -f phpMyAdmin-$pma_v-all-languages.tar.gz

+ 4 - 3
install/hst-install-ubuntu.sh

@@ -1102,15 +1102,16 @@ wget https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-langua
 tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
 
 # Delete file to prevent error
-if [ "$pma_#----------------------------------------------------------#
-#                    Update phpMyAdmin                     #
-v" = '4.8.3' ]; then
+if [ "$pma_v" = '4.8.3' ]; then
     rm -fr /usr/share/phpmyadmin/doc/html
 fi
 
 # Overwrite old files
 cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
 
+# Set config directory
+sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
+
 # Clear Up
 rm -fr phpMyAdmin-$pma_v-all-languages
 rm -f phpMyAdmin-$pma_v-all-languages.tar.gz