Merge pull request #1546 from rern/UPDATE

Update

install.sh

@@ -4,6 +4,21 @@ alias=r1
 
 . /srv/http/bash/settings/addons.sh
 
+# 20240105
+if [[ -e /usr/bin/camilladsp ]]; then
+	rm -f $dirsystem/camilla.conf
+	mkdir -p $dircamilladsp/raw
+	if [[ $( camilladsp -V ) != 'CamillaDSP 2.0.0' ]]; then
+		systemctl stop camilladsp
+		pacman -Sy --needed --noconfirm camilladsp
+		readarray -t files <<< $( grep -rl enable_resampling $dircamilladsp )
+		for f in "${files[@]}"; do
+			sed -i '/enable_resampling\|resampler_type/ d' "$f"
+		done
+		[[ -e $dirsystem/camilladsp ]] && systemctl start camilladsp
+	fi
+fi
+
 # 20231216
 if [[ ! -e /boot/kernel.img && $( pacman -Q python-websockets ) != 'python-websockets 12.0-1' ]]; then
 	pacman -Sy --needed --noconfirm python-websockets
@@ -62,32 +77,6 @@ if [[ -e /boot/kernel8.img ]]; then
 	pacman -Q wiringpi | grep 181 && pacman -Sy --noconfirm wiringpi
 fi
 
-# 29231101
-[[ ! -e /usr/bin/vcgencmd ]] && cp /opt/vc/bin/{dtoverlay,vcgencmd} /usr/bin
-
-# 20231022
-if [[ -e /boot/kernel.img && ! -e /lib/python3.10/site-packages/websocket ]]; then
-	echo '
-[alarm]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist
-
-[community]
-SigLevel = PackageRequired
-Include = /etc/pacman.d/mirrorlist' >> /etc/pacman.conf
-	pacman -Sy --noconfirm python-websocket-client
-	systemctl restart websocket
-fi
-
-# 20231020
-file=$dirsystem/localbrowser.conf
-if [[ -e $file ]] && ! grep -q runxinitrcd $file; then
-	sed -i -e '/hdmi/ d
-' -e '$ a\
-runxinitrcd=
-' $file
-fi
-
 #-------------------------------------------------------------------------------
 installstart "$1"