diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | lyrics/hd.py | 22 | ||||
| -rwxr-xr-x | lyrics/hd.sh | 8 |
3 files changed, 9 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index e4f289585..fd57ca369 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ EXTRA_DIST = \ if LYRICS lyrics_plugin_dir = @lyrics_plugin_dir@ -lyrics_plugins = hd.py leoslyrics.py lyricswiki.rb +lyrics_plugins = hd.sh leoslyrics.py lyricswiki.rb install-exec-local: install -m 0755 -d $(DESTDIR)$(lyrics_plugin_dir) diff --git a/lyrics/hd.py b/lyrics/hd.py deleted file mode 100755 index 173342c98..000000000 --- a/lyrics/hd.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/python -# -# Load lyrics from the user's home directory -# -# Author: Max Kellermann <max@duempel.org> -# - -from sys import argv, exit, stdout -from os import environ -from os.path import expanduser - -path = expanduser("~/.lyrics/%s - %s.txt" % (argv[1], argv[2])) -try: - f = file(path) -except IOError: - exit(2) - -while True: - x = f.read(4096) - if not x: - break - stdout.write(x) diff --git a/lyrics/hd.sh b/lyrics/hd.sh new file mode 100755 index 000000000..4bcbce4bb --- /dev/null +++ b/lyrics/hd.sh @@ -0,0 +1,8 @@ +#!/bin/sh -e +# +# Load lyrics from the user's home directory +# +# Author: Max Kellermann <max@duempel.org> +# + +cat ~/.lyrics/"$1 - $2".txt 2>/dev/null |