From: Max Kellermann <max@duempel.org>
Date: Thu, 25 Sep 2008 15:49:56 +0000 (+0200)
Subject: lyrics: replaced "hd.py" with "hd.sh"
X-Git-Tag: v0.12_alpha1~156
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43e418ebd4086dd483d0ec727ddcabf375f7d360;p=ncmpc.git

lyrics: replaced "hd.py" with "hd.sh"

Replace the "hd" plugin with a trivial shell script.
---

diff --git a/Makefile.am b/Makefile.am
index e4f2895..fd57ca3 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 173342c..0000000
--- 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 0000000..4bcbce4
--- /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