find_bins fallback

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/DhMakeELPA/Command/Packaging.pm b/lib/DhMakeELPA/Command/Packaging.pm
index 00eef51..b01d6cb 100644
--- a/lib/DhMakeELPA/Command/Packaging.pm
+++ b/lib/DhMakeELPA/Command/Packaging.pm
@@ -71,9 +71,15 @@ sub find_bins {
     my @el_files = glob($self->main_dir . "/*.el");
     my @pkg_files = glob($self->main_dir . "/*-pkg.el");
     @el_files = array_minus( @el_files, @pkg_files );
-    if (@el_files == 1) {
+    # try to ensure that the 'root' .el file is at the front of the list
+    @el_files = sort { length $a cmp length $b } @el_files;
+    my $single_bin = sub {
         my $bin = basename($el_files[0]) =~ s/\.el$//r;
         $self->bins({ "$bin" => ("*.el") });
+    };
+
+    if (@el_files == 1) {
+        &$single_bin();
     } else {
         $self->bins({});
         # there could be -pkg.el files that don't have an associated .el
@@ -90,6 +96,11 @@ sub find_bins {
                 $self->bins->{$name} = \@files;
             }
         }
+        # fallback: if we failed to figure out the bins, just use a
+        # single one
+        if ( scalar %{$self->bins} eq 0) {
+            &$single_bin();
+        }
     }
 }