From b5f8a44bebc906bf6a29d30c159802b0c1a7dbb1 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 6 Jul 2007 18:43:24 -0400
Subject: [PATCH] Move scripts from *.in to *.sh.in so gettext can determine
 type

If we move the scripts from *.in to *.sh.in and *.py.in, gettext can pull the
required strings to translate a whole lot easier. Do this.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 po/POTFILES.in                                | 14 +++---
 scripts/Makefile.am                           | 44 ++++++++++---------
 scripts/{abs.in => abs.sh.in}                 |  0
 scripts/{gensync.in => gensync.sh.in}         |  0
 scripts/{makepkg.in => makepkg.sh.in}         |  0
 scripts/{makeworld.in => makeworld.sh.in}     |  0
 ...cman-optimize.in => pacman-optimize.sh.in} |  0
 scripts/{rankmirrors.in => rankmirrors.py.in} |  0
 scripts/{repo-add.in => repo-add.sh.in}       |  0
 scripts/{repo-remove.in => repo-remove.sh.in} |  0
 scripts/{updatesync.in => updatesync.sh.in}   |  0
 11 files changed, 31 insertions(+), 27 deletions(-)
 rename scripts/{abs.in => abs.sh.in} (100%)
 rename scripts/{gensync.in => gensync.sh.in} (100%)
 rename scripts/{makepkg.in => makepkg.sh.in} (100%)
 rename scripts/{makeworld.in => makeworld.sh.in} (100%)
 rename scripts/{pacman-optimize.in => pacman-optimize.sh.in} (100%)
 rename scripts/{rankmirrors.in => rankmirrors.py.in} (100%)
 rename scripts/{repo-add.in => repo-add.sh.in} (100%)
 rename scripts/{repo-remove.in => repo-remove.sh.in} (100%)
 rename scripts/{updatesync.in => updatesync.sh.in} (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 841240b9..0f46f122 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,10 +13,10 @@ src/pacman/sync.c
 src/pacman/util.c
 
 # scripts with gettext translations
-scripts/abs.in
-scripts/gensync.in
-scripts/makepkg.in
-scripts/pacman-optimize.in
-scripts/repo-add.in
-scripts/repo-remove.in
-scripts/updatesync.in
+scripts/abs.sh.in
+scripts/gensync.sh.in
+scripts/makepkg.sh.in
+scripts/pacman-optimize.sh.in
+scripts/repo-add.sh.in
+scripts/repo-remove.sh.in
+scripts/updatesync.sh.in
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ba392fa9..01250f5b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -16,15 +16,15 @@ bin_SCRIPTS += abs
 endif
 
 EXTRA_DIST = \
-	abs.in \
-	gensync.in \
-	makepkg.in \
-	makeworld.in \
-	pacman-optimize.in \
-	rankmirrors.in \
-	repo-add.in \
-	repo-remove.in \
-	updatesync.in
+	abs.sh.in \
+	gensync.sh.in \
+	makepkg.sh.in \
+	makeworld.sh.in \
+	pacman-optimize.sh.in \
+	rankmirrors.py.in \
+	repo-add.sh.in \
+	repo-remove.sh.in \
+	updatesync.sh.in
 
 # Files that should be removed, but which Automake does not know.
 MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp
@@ -43,22 +43,26 @@ edit = sed \
 ## All the scripts depend on Makefile so that they are rebuilt when the
 ## prefix etc. changes. Use chmod -w to prevent people from editing the
 ## wrong file by accident.
+# two 'test' lines- make sure we can handle both sh and py type scripts
+# third 'test' line- make sure one of the two checks succeeded
 $(bin_SCRIPTS): Makefile
 	rm -f $@ $@.tmp
-	$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
+	test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true
+	test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true
+	test -f $@.tmp || false
 	chmod +x $@.tmp
 	chmod a-w $@.tmp
 	mv $@.tmp $@
 
-abs: $(srcdir)/abs.in
-gensync: $(srcdir)/gensync.in
-makepkg: $(srcdir)/makepkg.in
-makeworld: $(srcdir)/makeworld.in
-pacman-optimize: $(srcdir)/pacman-optimize.in
-rankmirrors: $(srcdir)/rankmirrors.in
-repo-add: $(srcdir)/repo-add.in
-repo-remove: $(srcdir)/repo-remove.in
-re-pacman: $(srcdir)/re-pacman.in
-updatesync: $(srcdir)/updatesync.in
+abs: $(srcdir)/abs.sh.in
+gensync: $(srcdir)/gensync.sh.in
+makepkg: $(srcdir)/makepkg.sh.in
+makeworld: $(srcdir)/makeworld.sh.in
+pacman-optimize: $(srcdir)/pacman-optimize.sh.in
+rankmirrors: $(srcdir)/rankmirrors.py.in
+repo-add: $(srcdir)/repo-add.sh.in
+repo-remove: $(srcdir)/repo-remove.sh.in
+re-pacman: $(srcdir)/re-pacman.sh.in
+updatesync: $(srcdir)/updatesync.sh.in
 
 # vim:set ts=2 sw=2 noet:
diff --git a/scripts/abs.in b/scripts/abs.sh.in
similarity index 100%
rename from scripts/abs.in
rename to scripts/abs.sh.in
diff --git a/scripts/gensync.in b/scripts/gensync.sh.in
similarity index 100%
rename from scripts/gensync.in
rename to scripts/gensync.sh.in
diff --git a/scripts/makepkg.in b/scripts/makepkg.sh.in
similarity index 100%
rename from scripts/makepkg.in
rename to scripts/makepkg.sh.in
diff --git a/scripts/makeworld.in b/scripts/makeworld.sh.in
similarity index 100%
rename from scripts/makeworld.in
rename to scripts/makeworld.sh.in
diff --git a/scripts/pacman-optimize.in b/scripts/pacman-optimize.sh.in
similarity index 100%
rename from scripts/pacman-optimize.in
rename to scripts/pacman-optimize.sh.in
diff --git a/scripts/rankmirrors.in b/scripts/rankmirrors.py.in
similarity index 100%
rename from scripts/rankmirrors.in
rename to scripts/rankmirrors.py.in
diff --git a/scripts/repo-add.in b/scripts/repo-add.sh.in
similarity index 100%
rename from scripts/repo-add.in
rename to scripts/repo-add.sh.in
diff --git a/scripts/repo-remove.in b/scripts/repo-remove.sh.in
similarity index 100%
rename from scripts/repo-remove.in
rename to scripts/repo-remove.sh.in
diff --git a/scripts/updatesync.in b/scripts/updatesync.sh.in
similarity index 100%
rename from scripts/updatesync.in
rename to scripts/updatesync.sh.in