This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=631f0e6c575495d76f5219f6af9677612788fb08 commit 631f0e6c575495d76f5219f6af9677612788fb08 Author: Guillem Jover <guil...@debian.org> AuthorDate: Tue Jan 20 21:45:54 2015 +0100 build: Rename shell scripts to .sh --- dselect/methods/Makefile.am | 30 +++++++++++++++++-------- dselect/methods/{ftp => disk}/.gitignore | 0 dselect/methods/disk/{install => install.sh} | 0 dselect/methods/disk/{setup => setup.sh} | 0 dselect/methods/disk/{update => update.sh} | 0 dselect/methods/{ftp => multicd}/.gitignore | 0 dselect/methods/multicd/{install => install.sh} | 0 dselect/methods/multicd/{setup => setup.sh} | 0 dselect/methods/multicd/{update => update.sh} | 0 t/shellcheck.t | 12 +++++----- 10 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am index e200b3de4..b5de5e39e 100644 --- a/dselect/methods/Makefile.am +++ b/dselect/methods/Makefile.am @@ -12,26 +12,30 @@ nobase_dist_methods_DATA = \ $(nil) nobase_methods_SCRIPTS = \ - ftp/setup \ - ftp/update \ - ftp/install \ - $(nil) - -nobase_dist_methods_SCRIPTS = \ + disk/install \ disk/setup \ disk/update \ - disk/install \ + ftp/install \ + ftp/setup \ + ftp/update \ + multicd/install \ multicd/setup \ multicd/update \ - multicd/install + $(nil) perllibdir = $(PERL_LIBDIR) nobase_dist_perllib_DATA = Dselect/Ftp.pm EXTRA_DIST = \ + disk/setup.sh \ + disk/update.sh \ + disk/install.sh \ ftp/setup.pl \ ftp/update.pl \ ftp/install.pl \ + multicd/setup.sh \ + multicd/update.sh \ + multicd/install.sh \ multicd/README.multicd CLEANFILES = \ @@ -41,13 +45,21 @@ CLEANFILES = \ do_perl_subst = $(AM_V_GEN) $(SED) \ -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" -SUFFIXES = .pl +SUFFIXES = .pl .sh .pl: @test -d `dirname $@` || $(MKDIR_P) `dirname $@` $(do_perl_subst) <$< >$@ $(AM_V_at) chmod +x $@ +do_shell_subst = $(AM_V_GEN) \ + cat + +.sh: Makefile + @test -d `dirname $@` || $(MKDIR_P) `dirname $@` + $(do_shell_subst) <$< >$@ + $(AM_V_at) chmod +x $@ + install-data-local: $(MKDIR_P) $(DESTDIR)$(admindir)/methods/mnt $(MKDIR_P) $(DESTDIR)$(admindir)/methods/disk diff --git a/dselect/methods/ftp/.gitignore b/dselect/methods/disk/.gitignore similarity index 100% copy from dselect/methods/ftp/.gitignore copy to dselect/methods/disk/.gitignore diff --git a/dselect/methods/disk/install b/dselect/methods/disk/install.sh similarity index 100% rename from dselect/methods/disk/install rename to dselect/methods/disk/install.sh diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup.sh similarity index 100% rename from dselect/methods/disk/setup rename to dselect/methods/disk/setup.sh diff --git a/dselect/methods/disk/update b/dselect/methods/disk/update.sh similarity index 100% rename from dselect/methods/disk/update rename to dselect/methods/disk/update.sh diff --git a/dselect/methods/ftp/.gitignore b/dselect/methods/multicd/.gitignore similarity index 100% copy from dselect/methods/ftp/.gitignore copy to dselect/methods/multicd/.gitignore diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install.sh similarity index 100% rename from dselect/methods/multicd/install rename to dselect/methods/multicd/install.sh diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup.sh similarity index 100% rename from dselect/methods/multicd/setup rename to dselect/methods/multicd/setup.sh diff --git a/dselect/methods/multicd/update b/dselect/methods/multicd/update.sh similarity index 100% rename from dselect/methods/multicd/update rename to dselect/methods/multicd/update.sh diff --git a/t/shellcheck.t b/t/shellcheck.t index c0a482104..a5ac5f26f 100644 --- a/t/shellcheck.t +++ b/t/shellcheck.t @@ -24,12 +24,12 @@ test_needs_command('shellcheck'); test_needs_srcdir_switch(); my @todofiles = qw( - dselect/methods/disk/install - dselect/methods/disk/setup - dselect/methods/disk/update - dselect/methods/multicd/install - dselect/methods/multicd/setup - dselect/methods/multicd/update + dselect/methods/disk/install.sh + dselect/methods/disk/setup.sh + dselect/methods/disk/update.sh + dselect/methods/multicd/install.sh + dselect/methods/multicd/setup.sh + dselect/methods/multicd/update.sh ); my @files = qw( autogen -- Dpkg.Org's dpkg
