Merge pull request #187 from hifiberry/development

Merge latest bugfixes into master
hifiberry · Dec 2, 2020 · 65290bd · 65290bd
2 parents 70edee2 + 7d03888
commit 65290bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/buildroot/package/audiocontrol2/audiocontrol2.conf b/buildroot/package/audiocontrol2/audiocontrol2.conf
@@ -19,7 +19,6 @@ password=
 [watchdog]
 raat=raat
 spotifyd=spotify
-mpd=mpd-mpris
 lms=lmsmpris
 ShairportSync=shairport-sync
 

diff --git a/scripts/updater.sh b/scripts/updater.sh
@@ -201,7 +201,7 @@ if [ "$V" -lt 20200706 ]; then
  else
    echo $STICKERS
  fi
-
+G
  sed -i 's/,/\;/g' /newroot/etc/smbmounts.conf
 fi 
 
@@ -224,9 +224,12 @@ if [ "$V" -lt 20201030 ]; then
  rm  /newroot/etc/hifiberry.state
 fi
 
-if [ "$V" -lt 20201130 ]; then
+if [ "$V" -lt 20201210 ]; then
  echo "Making sure, players will be configured correctly"
- rm  /newroot/etc/hifiberry.state
+ rm  /newroot/etc/hifiberry.state$
+
+ echo "Removing mpd watchdog from audiocontrol
+ sed s/^mpd=mpd-mpris$//g /newroot/etc/audiocontrol2.conf
 fi
 
 echo "Upgrading configuration files done"