Fix lxd_compile script + update path phpmyadmin config.inc.php (hestiacp#1528)

* Fix lxd_compile script + update path phpmyadmin config.inc.php

* Fix double creation of tmp folder

* Update permsions /usr/share/phpmyadmin/tmp/

Author: jaapmarcus

install/hst-install-debian.sh

@@ -1391,7 +1391,7 @@ if [ "$mysql" = 'yes' ]; then
     cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
 
     # Create copy of config file
-    cp -f $HESTIA_INSTALL_DIR/pma/config.inc.php /etc/phpmyadmin/
+    cp -f $HESTIA_INSTALL_DIR/phpmyadmin/config.inc.php /etc/phpmyadmin/
     mkdir -p /var/lib/phpmyadmin/tmp
     chmod 777 /var/lib/phpmyadmin/tmp
 
@@ -1400,7 +1400,6 @@ if [ "$mysql" = 'yes' ]; then
     sed -i "s|define('TEMP_DIR', ROOT_PATH . 'tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
 
     # Create temporary folder and change permission
-    mkdir /usr/share/phpmyadmin/tmp
     chmod 777 /usr/share/phpmyadmin/tmp
 
     # Generate blow fish

install/hst-install-ubuntu.sh

@@ -1444,8 +1444,7 @@ if [ "$mysql" = 'yes' ]; then
     cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
 
     # Create copy of config file
-    cp -f $HESTIA_INSTALL_DIR/pma/config.inc.php /etc/phpmyadmin/
-    mkdir -p /var/lib/phpmyadmin/tmp
+    cp -f $HESTIA_INSTALL_DIR/phpmyadmin/config.inc.php /etc/phpmyadmin/
     chmod 777 /var/lib/phpmyadmin/tmp
 
     # Set config and log directory

install/upgrade/manual/migrate_phpmyadmin.sh

@@ -45,6 +45,7 @@ then
    mkdir -p /etc/phpmyadmin
    mkdir -p /etc/phpmyadmin/conf.d/  
    mkdir /usr/share/phpmyadmin/tmp
+   chmod 777 /usr/share/phpmyadmin/tmp/
    mkdir -p /etc/phpmyadmin/conf.d/  
 
    # Configuring Apache2 for PHPMYADMIN

src/lxd_compile.sh

@@ -10,16 +10,16 @@ chmod +x /tmp/hst_autocompile.sh
 mkdir -p /opt/hestiacp
 
 # Building Hestia
-if bash /tmp/hst_autocompile.sh --hestia $branch no; then
+if bash /tmp/hst_autocompile.sh --hestia --noinstall --keepbuild $branch; then
     cp /tmp/hestiacp-src/debs/*.deb /opt/hestiacp/
 fi
 
 # Building PHP
-if bash /tmp/hst_autocompile.sh --php $branch no; then
+if bash /tmp/hst_autocompile.sh --php --noinstall --keepbuild $branch; then
     cp /tmp/hestiacp-src/debs/*.deb /opt/hestiacp/
 fi
 
 # Building NGINX
-if bash /tmp/hst_autocompile.sh --nginx $branch no; then
+if bash /tmp/hst_autocompile.sh --nginx --noinstall --keepbuild $branch; then
     cp /tmp/hestiacp-src/debs/*.deb /opt/hestiacp/
 fi