Merge branch 'devel'

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 https://github.com/jcorporation/myMPD/
 
+***
+
+## myMPD 14.1.1 (2023-04-03)
+
+This is a small bugfix release.
+
+### Changelog
+
+- Fix: mympd-config - cleanup before writing new values #1245
+
+***
+
 ## myMPD 14.1.0 (2024-03-12)
 
 This release enables the support for sticker sorting and fixes a severe mongoose bug.
@@ -12,6 +24,8 @@ This release enables the support for sticker sorting and fixes a severe mongoose
 - Fix: Problems with settings in 14.0.x #1221
 - Fix: Browse filesystem layout #1235
 
+***
+
 ## myMPD 14.0.4 (2024-03-03)
 
 This is a small bugfix release.

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_policy(SET CMP0003 NEW)
 # myMPD is written in C
 # supported compilers: gcc, clang
 project(mympd
-  VERSION 14.1.0
+  VERSION 14.1.1
   LANGUAGES C
 )
 

cli_tools/mympd-config/mympd-config

@@ -91,6 +91,7 @@ read_config() {
 }
 
 apply_config() {
+    find "${CONFIG_DIR}" -maxdepth 1 -type f -delete
     if [ "$MYMPD_SYSTEMD" -eq 1 ]
     then
         systemd-run -p DynamicUser=yes -p StateDirectory=mympd -p CacheDirectory=mympd \

contrib/man/mympd-config.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd-config.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "12 Mar 2024" "14.1.0" "mympd-config man page"
+.TH man 1 "03 Apr 2024" "14.1.1" "mympd-config man page"
 
 .SH NAME
 mympd-config \- mympd configuration tool

contrib/man/mympd-script.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd-script.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "12 Mar 2024" "14.1.0" "mympd-script man page"
+.TH man 1 "03 Apr 2024" "14.1.1" "mympd-script man page"
 
 .SH NAME
 mympd-script \- mympd command line tool to execute scripts

contrib/man/mympd.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd.
 .\" Contact <mail@jcgames.de> to correct errors or typos.
-.TH man 1 "12 Mar 2024" "14.1.0" "mympd man page"
+.TH man 1 "03 Apr 2024" "14.1.1" "mympd man page"
 
 .SH NAME
 myMPD \- standalone and mobile friendly web mpd client

contrib/packaging/alpine/APKBUILD

@@ -6,7 +6,7 @@
 # Maintainer: Juergen Mang <mail@jcgames.de>
 #
 pkgname=mympd
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=0
 pkgdesc="myMPD is a standalone and mobile friendly web-based MPD client."
 url="https://jcorporation.github.io/myMPD/"

contrib/packaging/arch/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Juergen Mang <mail@jcgames.de>
 
 pkgname=mympd
-pkgver=14.1.0
+pkgver=14.1.1
 pkgrel=1
 pkgdesc="A standalone and mobile friendly web-based MPD client."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')

contrib/packaging/debian/changelog

@@ -1,5 +1,5 @@
-mympd (14.1.0-1) unstable; urgency=medium
+mympd (14.1.1-1) unstable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <mail@jcgames.de>  Tue, 12 Mar 2024 19:03:32 +0100
+ -- Juergen Mang <mail@jcgames.de>  Wed, 03 Apr 2024 19:04:24 +0200

contrib/packaging/freebsd/multimedia/mympd/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	myMPD
 DISTVERSIONPREFIX= v
-DISTVERSION=	14.1.0
+DISTVERSION=	14.1.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	robert.david@posteo.net

contrib/packaging/openwrt/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := mympd
-PKG_VERSION := 14.1.0
+PKG_VERSION := 14.1.1
 PKG_RELEASE := 1
 
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz

contrib/packaging/rpm/mympd.spec

@@ -4,7 +4,7 @@
 # (c) 2018-2024 Juergen Mang <mail@jcgames.de>
 
 Name:           mympd
-Version:        14.1.0
+Version:        14.1.1
 Release:        0
 License:        GPL-3.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
@@ -69,5 +69,5 @@ fi
 %license LICENSE.md
 
 %changelog
-* Tue Mar 12 2024 Juergen Mang <mail@jcgames.de> 14.1.0-0
+* Wed Apr 03 2024 Juergen Mang <mail@jcgames.de> 14.1.1-0
 - Version from master

docs/_includes/version

@@ -1 +1 @@
-14.1.0
+14.1.1

htdocs/js/version.js

@@ -1,2 +1,2 @@
-const myMPDversion = '14.1.0';
-const myMPDbuild = '25050eb8f4670056cfec9aac9c17f9a87c1a65f1';
+const myMPDversion = '14.1.1';
+const myMPDbuild = 'a69cd30e2bdbec6ed1c539e81d203ae7d81004d3';