From 594afc9729a3a24ad08c8b84d8c215c963a4ea89 Mon Sep 17 00:00:00 2001 From: Justin Davis Date: Fri, 7 Oct 2011 17:10:46 -0400 Subject: Fix bug with ksh expanding newline in dquotes. --- bin/makepkgbuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/makepkgbuild b/bin/makepkgbuild index f2469bf..0df3bdb 100755 --- a/bin/makepkgbuild +++ b/bin/makepkgbuild @@ -10,7 +10,7 @@ appendpb() case "$txt" in '') return 0 ;; - *) echo "/^ *${func}()[ \\n]*{ + *) echo "/^ *${func}() *{ /^} i $txt @@ -29,7 +29,7 @@ prependpb() case "$txt" in '') return 0 ;; - *) echo "/^ *${func}()[ \\n]*{ + *) echo "/^ *${func}() *{ /^[ \t]*cd/ a $txt -- cgit v1.2.3-24-g4f1b From 4d348ea123d6bed169d3f7d458398b173800cbb5 Mon Sep 17 00:00:00 2001 From: Justin Davis Date: Fri, 7 Oct 2011 17:11:26 -0400 Subject: Remove src/ dir from package dir each time. --- bin/metas/perl.d/perl-dist | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/metas/perl.d/perl-dist b/bin/metas/perl.d/perl-dist index a829bb9..e4af02d 100755 --- a/bin/metas/perl.d/perl-dist +++ b/bin/metas/perl.d/perl-dist @@ -356,9 +356,10 @@ sub chsrcdir { my ($srcdir, $distfile) = @_; - unless(-d $srcdir) { - mkdir $srcdir or die "mkdir $srcdir: $!"; + if (-e $srcdir) { + system("rm", "-r", $srcdir) == 0 or die "failed to rm $srcdir\n"; } + mkdir $srcdir or die "mkdir $srcdir: $!"; chdir($srcdir) or die "chdir $srcdir: $!"; unless(-f $distfile) { symlink(catfile('..', $distfile), $distfile) or die "symlink $distfile: $!"; -- cgit v1.2.3-24-g4f1b