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>
This commit is contained in:
parent
49f447d02c
commit
b5f8a44beb
11 changed files with 31 additions and 27 deletions
|
@ -13,10 +13,10 @@ src/pacman/sync.c
|
||||||
src/pacman/util.c
|
src/pacman/util.c
|
||||||
|
|
||||||
# scripts with gettext translations
|
# scripts with gettext translations
|
||||||
scripts/abs.in
|
scripts/abs.sh.in
|
||||||
scripts/gensync.in
|
scripts/gensync.sh.in
|
||||||
scripts/makepkg.in
|
scripts/makepkg.sh.in
|
||||||
scripts/pacman-optimize.in
|
scripts/pacman-optimize.sh.in
|
||||||
scripts/repo-add.in
|
scripts/repo-add.sh.in
|
||||||
scripts/repo-remove.in
|
scripts/repo-remove.sh.in
|
||||||
scripts/updatesync.in
|
scripts/updatesync.sh.in
|
||||||
|
|
|
@ -16,15 +16,15 @@ bin_SCRIPTS += abs
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
abs.in \
|
abs.sh.in \
|
||||||
gensync.in \
|
gensync.sh.in \
|
||||||
makepkg.in \
|
makepkg.sh.in \
|
||||||
makeworld.in \
|
makeworld.sh.in \
|
||||||
pacman-optimize.in \
|
pacman-optimize.sh.in \
|
||||||
rankmirrors.in \
|
rankmirrors.py.in \
|
||||||
repo-add.in \
|
repo-add.sh.in \
|
||||||
repo-remove.in \
|
repo-remove.sh.in \
|
||||||
updatesync.in
|
updatesync.sh.in
|
||||||
|
|
||||||
# Files that should be removed, but which Automake does not know.
|
# Files that should be removed, but which Automake does not know.
|
||||||
MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp
|
MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp
|
||||||
|
@ -43,22 +43,26 @@ edit = sed \
|
||||||
## All the scripts depend on Makefile so that they are rebuilt when the
|
## 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
|
## prefix etc. changes. Use chmod -w to prevent people from editing the
|
||||||
## wrong file by accident.
|
## 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
|
$(bin_SCRIPTS): Makefile
|
||||||
rm -f $@ $@.tmp
|
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 +x $@.tmp
|
||||||
chmod a-w $@.tmp
|
chmod a-w $@.tmp
|
||||||
mv $@.tmp $@
|
mv $@.tmp $@
|
||||||
|
|
||||||
abs: $(srcdir)/abs.in
|
abs: $(srcdir)/abs.sh.in
|
||||||
gensync: $(srcdir)/gensync.in
|
gensync: $(srcdir)/gensync.sh.in
|
||||||
makepkg: $(srcdir)/makepkg.in
|
makepkg: $(srcdir)/makepkg.sh.in
|
||||||
makeworld: $(srcdir)/makeworld.in
|
makeworld: $(srcdir)/makeworld.sh.in
|
||||||
pacman-optimize: $(srcdir)/pacman-optimize.in
|
pacman-optimize: $(srcdir)/pacman-optimize.sh.in
|
||||||
rankmirrors: $(srcdir)/rankmirrors.in
|
rankmirrors: $(srcdir)/rankmirrors.py.in
|
||||||
repo-add: $(srcdir)/repo-add.in
|
repo-add: $(srcdir)/repo-add.sh.in
|
||||||
repo-remove: $(srcdir)/repo-remove.in
|
repo-remove: $(srcdir)/repo-remove.sh.in
|
||||||
re-pacman: $(srcdir)/re-pacman.in
|
re-pacman: $(srcdir)/re-pacman.sh.in
|
||||||
updatesync: $(srcdir)/updatesync.in
|
updatesync: $(srcdir)/updatesync.sh.in
|
||||||
|
|
||||||
# vim:set ts=2 sw=2 noet:
|
# vim:set ts=2 sw=2 noet:
|
||||||
|
|
Loading…
Add table
Reference in a new issue