From: Ian Jackson Date: Wed, 20 Jun 2018 15:28:00 +0000 (+0100) Subject: Dgit.pm: Move shell_cmd from dgit X-Git-Tag: archive/debian/5.1~3 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0effa0aab06b3a56382729f79fbea79ae36531b8 Dgit.pm: Move shell_cmd from dgit Signed-off-by: Ian Jackson --- diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index aec5a239..c0ee27fc 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -47,7 +47,7 @@ BEGIN { fail failmsg ensuredir must_getcwd executable_on_path waitstatusmsg failedcmd_waitstatus failedcmd_report_cmd failedcmd - runcmd cmdoutput cmdoutput_errok + runcmd shell_cmd cmdoutput cmdoutput_errok git_rev_parse git_cat_file git_get_ref git_get_symref git_for_each_ref git_for_each_tag_referring is_fast_fwd @@ -315,6 +315,11 @@ sub runcmd { failedcmd @_ if system @_; } +sub shell_cmd { + my ($first_shell, @cmd) = @_; + return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd; +} + sub cmdoutput_errok { confess Dumper(\@_)." ?" if grep { !defined } @_; debugcmd "|",@_; diff --git a/dgit b/dgit index 94f915ef..2cf78ec7 100755 --- a/dgit +++ b/dgit @@ -561,11 +561,6 @@ sub runcmd_ordryrun_local { } } -sub shell_cmd { - my ($first_shell, @cmd) = @_; - return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd; -} - our $helpmsg = <