Browse Source

Change from bash to source for including phpmyadmin fix.

Raphael Schneeberger 7 years ago
parent
commit
fd3c017197

+ 0 - 2
install/debian/8/phpmyadmin/pma.sh

@@ -10,8 +10,6 @@
 # Changed some lines to fit to Hestia Configuration.
 #
 
-hestiacp=$1
-
 PASS=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -c 32 ; echo`
 echo "PMA Password = $PASS";
 

+ 0 - 2
install/debian/9/phpmyadmin/pma.sh

@@ -10,8 +10,6 @@
 # Changed some lines to fit to Hestia Configuration.
 #
 
-hestiacp=$1
-
 PASS=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -c 32 ; echo`
 echo "PMA Password = $PASS";
 

+ 1 - 1
install/hst-install-debian.sh

@@ -1327,7 +1327,7 @@ fi
 # Special thanks to Pavel Galkin (https://skurudo.ru)
 # https://github.com/skurudo/phpmyadmin-fixer
 
-bash $hestiacp/phpmyadmin/pma.sh $hestiacp
+source $hestiacp/phpmyadmin/pma.sh
 
 #----------------------------------------------------------#
 #                   Configure Admin User                   #

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -1299,7 +1299,7 @@ fi
 # Special thanks to Pavel Galkin (https://skurudo.ru)
 # https://github.com/skurudo/phpmyadmin-fixer
 
-bash $hestiacp/phpmyadmin/pma.sh $hestiacp
+source $hestiacp/phpmyadmin/pma.sh
 
 
 #----------------------------------------------------------#

+ 0 - 2
install/ubuntu/14.04/phpmyadmin/pma.sh

@@ -10,8 +10,6 @@
 # Changed some lines to fit to Hestia Configuration.
 #
 
-hestiacp=$1
-
 PASS=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -c 32 ; echo`
 echo "PMA Password = $PASS";
 

+ 0 - 2
install/ubuntu/16.04/phpmyadmin/pma.sh

@@ -10,8 +10,6 @@
 # Changed some lines to fit to Hestia Configuration.
 #
 
-hestiacp=$1
-
 PASS=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -c 32 ; echo`
 echo "PMA Password = $PASS";
 

+ 0 - 2
install/ubuntu/18.04/phpmyadmin/pma.sh

@@ -10,8 +10,6 @@
 # Changed some lines to fit to Hestia Configuration.
 #
 
-hestiacp=$1
-
 PASS=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -c 32 ; echo`
 echo "PMA Password = $PASS";