Change from bash to source for including phpmyadmin fix.

ScIT-Raphael · ScIT-Raphael · commit fd3c01719704 · 2018-10-31T10:05:57.000+01:00
diff --git a/install/debian/8/phpmyadmin/pma.sh b/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";
 
diff --git a/install/debian/9/phpmyadmin/pma.sh b/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";
 
diff --git a/install/hst-install-debian.sh b/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                   #
diff --git a/install/hst-install-ubuntu.sh b/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
 
 
 #----------------------------------------------------------#
diff --git a/install/ubuntu/14.04/phpmyadmin/pma.sh b/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";
 
diff --git a/install/ubuntu/16.04/phpmyadmin/pma.sh b/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";
 
diff --git a/install/ubuntu/18.04/phpmyadmin/pma.sh b/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";
 

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`# Changed some lines to fit to Hestia Configuration.`
`11`	`11`	`#`
`12`	`12`
`13`		`-hestiacp=$1`
`14`		`-`
`15`	`13`	PASS=`cat /dev/urandom \| tr -dc 'a-zA-Z0-9' \| fold -w ${1:-32} \| head -c 32 ; echo`
`16`	`14`	`echo "PMA Password = $PASS";`
`17`	`15`