From 470b49181f64432a8361b3b86d222d54401e888d Mon Sep 17 00:00:00 2001 From: Spiros Georgaras Date: Mon, 16 Mar 2020 22:33:31 +0200 Subject: [PATCH 1/3] macOS Catalina installation fix --- devel/build_install_pyradio | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/build_install_pyradio b/devel/build_install_pyradio index d21512e3..98449f24 100755 --- a/devel/build_install_pyradio +++ b/devel/build_install_pyradio @@ -29,7 +29,7 @@ uninstall(){ else sudo rm -rf /usr/local/share/doc/pyradio 2>/dev/null fi - sudo rm -f /usr/share/man/man1/pyradio.1.gz 2>/dev/null + sudo rm -f /usr/share/man/man1/pyradio.1.gz 2>/dev/null || sudo rm -f /usr/local/share/man/man1/pyradio.1.gz 2>/dev/null echo "PyRadio successfully uninstalled" } @@ -98,7 +98,7 @@ descr=$(git describe --long --tags 2>/dev/null || echo not_from_git) echo -n "s/git_description = ''/git_description = '" > sed.$$ echo -n "${descr}" >> sed.$$ echo "'/" >> sed.$$ - sed -f sed.$$ pyradio/radio.py > tmp-radio.py && mv tmp-radio.py pyradio/radio.py || { + sed -f sed.$$ pyradio/radio.py > tmp-radio.py && mv -f tmp-radio.py pyradio/radio.py || { # failed... restore radio.py # and build without revision info git checkout pyradio/radio.py @@ -112,7 +112,7 @@ python"${TO_PYTHON}" setup.py build && { echo "***** installing..." sudo python"${TO_PYTHON}" setup.py install && { gzip -k pyradio.1 - sudo mv pyradio.1.gz /usr/share/man/man1 + sudo mv -f pyradio.1.gz /usr/share/man/man1 2>/dev/null || sudo mv -f pyradio.1.gz /usr/local/share/man/man1 DOC=/usr/share/doc/pyradio sudo mkdir "$DOC" 2>/dev/null if [ ! -d "$DOC" ];then @@ -138,7 +138,7 @@ python"${TO_PYTHON}" setup.py build && { [ -z "$descr" ] || { echo "s/git_description = '[^']*'/git_description = ''/" > sed.$$ sed -f sed.$$ pyradio/radio.py > tmp-radio.py - mv tmp-radio.py pyradio/radio.py + mv -f tmp-radio.py pyradio/radio.py #git checkout pyradio/radio.py } rm sed.$$ 2>/dev/null From ed59f9e115a9de2b08645a749c7cb435a8ce4b34 Mon Sep 17 00:00:00 2001 From: Spiros Georgaras Date: Mon, 16 Mar 2020 22:35:07 +0200 Subject: [PATCH 2/3] version 0.8.7.2 --- pyradio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyradio/__init__.py b/pyradio/__init__.py index ccb30a41..0417ed2a 100644 --- a/pyradio/__init__.py +++ b/pyradio/__init__.py @@ -1,6 +1,6 @@ " pyradio -- Console radio player. " -version_info = (0, 8, 7, 1) +version_info = (0, 8, 7, 2) __version__ = version = '.'.join(map(str, version_info)) __project__ = __name__ From 1fc60e5a48aff12e993d7d8f63b3c2c5269f0c51 Mon Sep 17 00:00:00 2001 From: Spiros Georgaras Date: Mon, 16 Mar 2020 22:37:05 +0200 Subject: [PATCH 3/3] version 0.8.7.2 --- Changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Changelog b/Changelog index d3870ed2..977e58e7 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +2020-03-16 s-n-g + * Version 0.8.7.2 + * Fixing macOS Catalina installation + 2020-01-31 s-n-g * Version 0.8.7.1 * Fixing mpv playlist option (for mpv 0.32.0)