Merge pull request #1310 from rern/UPDATE

Update
rern · May 23, 2023 · ab8aabf · ab8aabf
2 parents fd64385 + 9721550
commit ab8aabf
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/srv/http/assets/js/system.js b/srv/http/assets/js/system.js
@@ -594,7 +594,7 @@ $( '#backup' ).on( 'click', function() {
 							a.href = url;
 							a.download = 'backup.gz';
 							document.body.appendChild( a );
-							a.trigger( 'click' );
+							a.click();
 							setTimeout( () => {
 								a.remove();
 								window.URL.revokeObjectURL( url );

diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
@@ -419,8 +419,7 @@ lyrics )
 		. $dirsystem/lyrics.conf
 		if [[ $embedded && $( < $dirshm/player ) == mpd ]]; then
 			file=$( getVar file $dirshm/status )
-			dir=${file/\/*}
-			if [[ $dir == SD || $dir == USB ]]; then
+			if [[ ${file/\/*} =~ ^(USB|NAS|SD)$ ]]; then
 				file="/mnt/MPD/$file"
 				lyrics=$( kid3-cli -c "select \"$file\"" -c "get lyrics" )
 				[[ $lyrics ]] && echo "$lyrics" && exit

diff --git a/srv/http/bash/common.sh b/srv/http/bash/common.sh
@@ -124,19 +124,6 @@ confNotString() {
 confFromJson() { # $1 - file
 	sed -E '/\{|}/d; s/,//; s/^\s*"(.*)": "*(.*)"*$/\1="\2"/' "$1"
 }
-cpuInfo() {
-	local BB C hwrevision
-	hwrevision=$( grep ^Revision /proc/cpuinfo )
-	BB=${hwrevision: -3:2}
-	C=${hwrevision: -4:1}
-	                                      data=BB=$BB$'\n'
-	                                      data+=C=$C$'\n'
-	[[ $BB =~ ^(09|0c|12)$ ]]          || data+=onboardsound=true$'\n'    # not zero, zero w, zero 2w
-	[[ $BB =~ ^(00|01|02|03|04|09)$ ]] || data+=onboardwireless=true$'\n' # not zero, 1, 2
-	[[ $BB =~ ^(09|0c)$ ]]             && data+=rpi0=true$'\n'            # zero
-	[[ $BB == 0d ]]                    && data+=rpi3bplus=true$'\n'       # 3B+
-	echo "$data" > $dirshm/cpuinfo
-}
 data2json() {
 	local data json
 	data="$1"

diff --git a/srv/http/bash/settings/system-data.sh b/srv/http/bash/settings/system-data.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . /srv/http/bash/common.sh
-[[ -e $dirshm/cpuinfo ]] && . $dirshm/cpuinfo || cpuInfo
 
 timezone=$( timedatectl | awk '/zone:/ {print $3}' )
 timezoneoffset=$( date +%z | sed -E 's/(..)$/:\1/' )

diff --git a/srv/http/bash/startup.sh b/srv/http/bash/startup.sh
@@ -2,7 +2,17 @@
 
 . /srv/http/bash/common.sh
 
-cpuInfo
+hwrevision=$( grep ^Revision /proc/cpuinfo )
+BB=${hwrevision: -3:2}
+C=${hwrevision: -4:1}
+									  data=BB=$BB$'\n'
+									  data+=C=$C$'\n'
+[[ $BB =~ ^(09|0c|12)$ ]]          || data+=onboardsound=true$'\n'    # not zero, zero w, zero 2w
+[[ $BB =~ ^(00|01|02|03|04|09)$ ]] || data+=onboardwireless=true$'\n' # not zero, 1, 2
+[[ $BB =~ ^(09|0c)$ ]]             && data+=rpi0=true$'\n'            # zero
+[[ $BB == 0d ]]                    && data+=rpi3bplus=true$'\n'       # 3B+
+echo "$data" > $dirshm/cpuinfo
+
 # wifi - on-board or usb
 wlandev=$( $dirsettings/networks.sh wlandevice )
 

diff --git a/srv/http/bash/status.sh b/srv/http/bash/status.sh
@@ -8,7 +8,9 @@
 
 . /srv/http/bash/common.sh
 
-mpc | grep ^Updating && updating_db=true || rm -f $dirmpd/updating
+if [[ -e $dirmpd/updating ]]; then
+	mpc | grep -q ^Updating && updating_db=true || rm -f $dirmpd/updating
+fi
 
 if [[ -L $dirmpd && ! -e $dirmpd/counts ]]; then # shared data
 	for i in {1..10}; do

diff --git a/srv/http/cmd.php b/srv/http/cmd.php
@@ -87,6 +87,7 @@
 	$option = '<option value="none">None / Auto detect</option>';
 	foreach( $list as $name => $sysname ) $option .= '<option value="'.$sysname.'">'.$name.'</option>';
 	echo $option;
+	break;
 case 'selecttimezone':
 	$list   = timezone_identifiers_list();
 	$option = '<option value="auto">Auto</option>';
@@ -97,6 +98,7 @@
 		$option  .= '<option value="'.$zone.'">'.$zonename.'&ensp;'.$offset.'</option>';
 	}
 	echo $option;
+	break;
 
 }