Merge pull request #1771 from rern/UPDATE

Update
rern · Sep 14, 2024 · 1aa27e9 · 1aa27e9
2 parents 99388f1 + a2e14a3
commit 1aa27e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/install.sh b/install.sh
@@ -4,7 +4,7 @@ alias=r1
 
 . /srv/http/bash/settings/addons.sh
 
-# 20240913
+# 20240914
 file=$dirsystem/volumeboot
 if [[ -e $file ]]; then
 	echo "\

diff --git a/srv/http/bash/common.sh b/srv/http/bash/common.sh
@@ -164,11 +164,9 @@ data2json() {
 	[[ $page == status.sh ]] && page='"page" : false' || page='"page" : "'$page'"'
 	json="\
 {
-$page
-$1
+  $page$1
 }"
-	# "k": > "k": false # "k":} > "k": false} # [, > [false, # ,, > ,false, # ,] > ,false]
-	json=$( data2jsonPatch "$json" )
+	json=$( data2jsonPatch "$json" ) # "k": > "k": false # "k":} > "k": false} # [, > [false, # ,, > ,false, # ,] > ,false]
 	if [[ $2 ]]; then
 		pushData refresh "$json"
 	else

diff --git a/srv/http/bash/settings/features-data.sh b/srv/http/bash/settings/features-data.sh
@@ -13,7 +13,9 @@ if [[ -e $dirsystem/volumelimit ]]; then
 	volumelimit=true
 	volumelimitconf=$( conf2json $dirsystem/volumelimit.conf )
 else
-	volumelimitconf='{ "STARTUP": '$( volumeGet )', "MAX": 100 }'
+	volume=$( volumeGet )
+	[[ $volume == 0 || ! $volume ]] && volume=50
+	volumelimitconf='{ "STARTUP": '$volume', "MAX": 100 }'
 fi
 
 ##########