From 4063e82a1512515358480b53d87223f71e0efc20 Mon Sep 17 00:00:00 2001
From: Pablo Lezaeta <prflr88@gmail.com>
Date: Wed, 4 Jul 2012 23:30:29 -0400
Subject: Migration to /usr/share/ponysay/{,tty}ponies (need more reviews)

---
 Makefile                      | 13 +++++++------
 completion/bash-completion.sh |  4 ++--
 completion/zsh-completion.zsh |  2 +-
 ponysay                       |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 3ae7314..754009c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,11 @@ ponysaytruncater:
 	gcc -o "ponysaytruncater" "ponysaytruncater.c"
 
 install: all
-	mkdir -p "$(DESTDIR)/usr/share/ponies"
-	mkdir -p "$(DESTDIR)/usr/share/ttyponies"
-	cp ponies/*.pony "$(DESTDIR)/usr/share/ponies/"
-	cp ttyponies/*.pony "$(DESTDIR)/usr/share/ttyponies/"
+	mkdir -p "$(DESTDIR)/usr/share/ponysay/"
+	mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies"
+	mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies"
+	cp ponies/*.pony "$(DESTDIR)/usr/share/ponysay/ponies/"
+	cp ttyponies/*.pony "$(DESTDIR)/usr/share/ponysay/ttyponies/"
 
 	mkdir -p "$(DESTDIR)/usr/bin/"
 	install "ponysay" "$(DESTDIR)/usr/bin/ponysay"
@@ -24,8 +25,8 @@ install: all
 	install "COPYING" "$(DESTDIR)/usr/share/licenses/ponysay/COPYING"
 
 uninstall:
-	rm -fr "$(DESTDIR)/usr/share/ponies"
-	rm -fr "$(DESTDIR)/usr/share/ttyponies"
+	rm -fr "$(DESTDIR)/usr/share/ponysay/ponies"
+	rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies"
 	unlink "$(DESTDIR)/usr/bin/ponysay"
 	unlink "$(DESTDIR)/usr/bin/ponysaytruncater"
 	unlink "$(DESTDIR)/usr/bin/ponythink"
diff --git a/completion/bash-completion.sh b/completion/bash-completion.sh
index 31daef2..54b50fe 100644
--- a/completion/bash-completion.sh
+++ b/completion/bash-completion.sh
@@ -10,10 +10,10 @@ _ponysay()
     if [[ $prev = "-f" ]]; then
 	COMPREPLY=()
 	
-	sysponies=/usr/share/ponies/
+	sysponies=/usr/share/ponysay/ponies/
 	usrponies=~/.ponies/
 	if [[ $TERM = "linux" ]]; then
-	    sysponies=/usr/share/ttyponies/
+	    sysponies=/usr/share/ponysay/ttyponies/
 	    usrponies=~/.ttyponies/
 	fi
 	
diff --git a/completion/zsh-completion.zsh b/completion/zsh-completion.zsh
index 26116d2..07b2ebf 100644
--- a/completion/zsh-completion.zsh
+++ b/completion/zsh-completion.zsh
@@ -3,7 +3,7 @@ _shortopts=(
     '-v[Show version and exit]'
     '-h[Show this help and exit]'
     '-l[list ponyfiles]'
-    '-f[Select a pony (either a filename or a ponyname]: :_path_files -W "/usr/share/ponies" -g "*(\:r)"'
+    '-f[Select a pony (either a filename or a ponyname]: :_path_files -W "/usr/share/ponysay/ponies" -g "*(\:r)"'
     '-W[The screen column where the message should be wrapped]'
     )
 _arguments -s : \
diff --git a/ponysay b/ponysay
index a04d8d7..b3c31b8 100755
--- a/ponysay
+++ b/ponysay
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 version=0.9
-SYSTEMPONIES=/usr/share/ponies
+SYSTEMPONIES=/usr/share/ponysay/ponies
 HOMEPONIES="${HOME}/.ponies"
 pony="*"
 wrap=
 
 if [ "$TERM" = "linux" ]; then
-    SYSTEMPONIES=/usr/share/ttyponies
+    SYSTEMPONIES=/usr/share/ponysay/ttyponies
     HOMEPONIES="${HOME}/.ttyponies"
 fi
 
-- 
cgit