|
@@ -26,9 +26,9 @@ source_conf "$HESTIA/conf/hestia.conf"
|
|
|
# JSON list function
|
|
# JSON list function
|
|
|
json_list() {
|
|
json_list() {
|
|
|
i=1
|
|
i=1
|
|
|
- objects=$(echo "$versions" |wc -w)
|
|
|
|
|
|
|
+ objects=$(echo "${versions[@]}" |wc -w)
|
|
|
echo '['
|
|
echo '['
|
|
|
- for version in $versions; do
|
|
|
|
|
|
|
+ for version in "${versions[@]}"; do
|
|
|
if [ "$i" -lt "$objects" ]; then
|
|
if [ "$i" -lt "$objects" ]; then
|
|
|
echo -e "\t\"$version\","
|
|
echo -e "\t\"$version\","
|
|
|
else
|
|
else
|
|
@@ -43,14 +43,14 @@ json_list() {
|
|
|
shell_list() {
|
|
shell_list() {
|
|
|
echo "VERSION"
|
|
echo "VERSION"
|
|
|
echo "--------"
|
|
echo "--------"
|
|
|
- for version in $versions; do
|
|
|
|
|
|
|
+ for version in "${versions[@]}"; do
|
|
|
echo "$version"
|
|
echo "$version"
|
|
|
done
|
|
done
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
# PLAIN list function
|
|
# PLAIN list function
|
|
|
plain_list() {
|
|
plain_list() {
|
|
|
- for version in $versions; do
|
|
|
|
|
|
|
+ for version in "${versions[@]}"; do
|
|
|
echo "$version"
|
|
echo "$version"
|
|
|
done
|
|
done
|
|
|
}
|
|
}
|
|
@@ -58,7 +58,7 @@ plain_list() {
|
|
|
# CSV list function
|
|
# CSV list function
|
|
|
csv_list() {
|
|
csv_list() {
|
|
|
echo "VERSION"
|
|
echo "VERSION"
|
|
|
- for version in $versions; do
|
|
|
|
|
|
|
+ for version in "${versions[@]}"; do
|
|
|
echo "$version"
|
|
echo "$version"
|
|
|
done
|
|
done
|
|
|
}
|
|
}
|
|
@@ -68,8 +68,12 @@ csv_list() {
|
|
|
# Action #
|
|
# Action #
|
|
|
#----------------------------------------------------------#
|
|
#----------------------------------------------------------#
|
|
|
|
|
|
|
|
|
|
+declare -a versions;
|
|
|
# List through /etc/php
|
|
# List through /etc/php
|
|
|
-versions=$(/usr/sbin/phpquery -V);
|
|
|
|
|
|
|
+for version in /etc/php/*/fpm; do
|
|
|
|
|
+ ver=$(echo "$version" | awk -F"/" '{ print $4 }');
|
|
|
|
|
+ versions+=("$ver")
|
|
|
|
|
+done
|
|
|
|
|
|
|
|
# Listing data
|
|
# Listing data
|
|
|
case $format in
|
|
case $format in
|