Skip to content

macOS Catalina installation fix #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 16, 2020
Merged

macOS Catalina installation fix #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
470b491
macOS Catalina installation fix
s-n-g Mar 16, 2020
ed59f9e
version 0.8.7.2
s-n-g Mar 16, 2020
1fc60e5
version 0.8.7.2
s-n-g Mar 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions devel/build_install_pyradio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion pyradio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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__
Expand Down