diff options
| -rw-r--r-- | po/POTFILES.in | 14 | ||||
| -rw-r--r-- | scripts/Makefile.am | 44 | ||||
| -rw-r--r-- | scripts/abs.sh.in (renamed from scripts/abs.in) | 0 | ||||
| -rw-r--r-- | scripts/gensync.sh.in (renamed from scripts/gensync.in) | 0 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in (renamed from scripts/makepkg.in) | 0 | ||||
| -rw-r--r-- | scripts/makeworld.sh.in (renamed from scripts/makeworld.in) | 0 | ||||
| -rw-r--r-- | scripts/pacman-optimize.sh.in (renamed from scripts/pacman-optimize.in) | 0 | ||||
| -rw-r--r-- | scripts/rankmirrors.py.in (renamed from scripts/rankmirrors.in) | 0 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in (renamed from scripts/repo-add.in) | 0 | ||||
| -rw-r--r-- | scripts/repo-remove.sh.in (renamed from scripts/repo-remove.in) | 0 | ||||
| -rw-r--r-- | scripts/updatesync.sh.in (renamed from scripts/updatesync.in) | 0 |
11 files changed, 31 insertions, 27 deletions
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 index 491b965a..491b965a 100644 --- a/scripts/abs.in +++ b/scripts/abs.sh.in diff --git a/scripts/gensync.in b/scripts/gensync.sh.in index ca83c17b..ca83c17b 100644 --- a/scripts/gensync.in +++ b/scripts/gensync.sh.in diff --git a/scripts/makepkg.in b/scripts/makepkg.sh.in index 8be44c65..8be44c65 100644 --- a/scripts/makepkg.in +++ b/scripts/makepkg.sh.in diff --git a/scripts/makeworld.in b/scripts/makeworld.sh.in index 23976b5e..23976b5e 100644 --- a/scripts/makeworld.in +++ b/scripts/makeworld.sh.in diff --git a/scripts/pacman-optimize.in b/scripts/pacman-optimize.sh.in index d4c926d8..d4c926d8 100644 --- a/scripts/pacman-optimize.in +++ b/scripts/pacman-optimize.sh.in diff --git a/scripts/rankmirrors.in b/scripts/rankmirrors.py.in index 2b284efe..2b284efe 100644 --- a/scripts/rankmirrors.in +++ b/scripts/rankmirrors.py.in diff --git a/scripts/repo-add.in b/scripts/repo-add.sh.in index 3f009af8..3f009af8 100644 --- a/scripts/repo-add.in +++ b/scripts/repo-add.sh.in diff --git a/scripts/repo-remove.in b/scripts/repo-remove.sh.in index 02021f33..02021f33 100644 --- a/scripts/repo-remove.in +++ b/scripts/repo-remove.sh.in diff --git a/scripts/updatesync.in b/scripts/updatesync.sh.in index 1526e285..1526e285 100644 --- a/scripts/updatesync.in +++ b/scripts/updatesync.sh.in |