Merge tag 'v0.004' into debian

v0.004

# gpg: Signature made Wed 18 Mar 2020 05:19:15 PM MST
# gpg:                using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg:                issuer "spwhitton@spwhitton.name"
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4  753F 0F56 D055 3B6D 411B
#      Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC  248B 695B 7AE4 BF06 6240

5 files changed, 13 insertions, 7 deletions

diff --git a/Changes b/Changes
index 7d72e95..b27b32f 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,11 @@ Revision history for Git::Annex
 
 {{$NEXT}}
 
+0.004     2020-03-18 17:08:57-07:00 America/Phoenix
+    - annex-to-annex-dropunused: Fix attempt to call wrong main()
+      routine.
+    - annex-to-annex-reinject: Add missing import of File::Temp.
+
 0.003     2020-03-11 14:35:04-07:00 America/Phoenix
     - annex-to-annex: Fix path passed to git-annex-find(1) when
       looking for missing files.
diff --git a/bin/annex-to-annex-dropunused b/bin/annex-to-annex-dropunused
index bbbea80..c09cdc5 100755
--- a/bin/annex-to-annex-dropunused
+++ b/bin/annex-to-annex-dropunused
@@ -41,4 +41,4 @@ git-annex-dropunused(1), annex-to-annex(1), annex-to-annex-reinject(1)
 =cut
 
 use App::annex_to_annex_dropunused;
-exit App::annex_to_annex->main;
+exit App::annex_to_annex_dropunused->main;
diff --git a/dist.ini b/dist.ini
index a85f87c..deb765e 100644
--- a/dist.ini
+++ b/dist.ini
@@ -4,7 +4,7 @@ license          = GPL_3
 copyright_holder = Sean Whitton <spwhitton@spwhitton.name>
 copyright_year   = 2019-2020
 
-version          = 0.003
+version          = 0.004
 
 [PkgVersion]
 [PodWeaver]
diff --git a/lib/App/annex_review_unused.pm b/lib/App/annex_review_unused.pm
index 22e7a56..2527193 100644
--- a/lib/App/annex_review_unused.pm
+++ b/lib/App/annex_review_unused.pm
@@ -110,9 +110,9 @@ sub main {
             unless ($just_print) {
                 # truncate log output if necessary to ensure user's
                 # terminal does not scroll
-                my (undef, $height) = GetTerminalSize();
-                splice @log_lines, (($height - 5) - @log_lines)
-                  if @log_lines > ($height - 5);
+                my (undef, $height) = GetTerminalSize;
+                splice @log_lines, $height - (5 + @log_lines)
+                  if 5 + @log_lines > $height;
             }
             print "\n";
             say for @log_lines;
@@ -122,7 +122,7 @@ sub main {
                     # before prompting, clear out stdin, to avoid
                     # registered a keypress more than once
                     ReadMode 4;
-                    1 while defined ReadKey(-1);
+                    1 while defined ReadKey -1;
 
                     my @opts = ('y', 'n');
                     push @opts, 'o' if $contentlocation;
@@ -137,7 +137,7 @@ sub main {
                     ReadMode 0;
 
                     # respond to C-c
-                    exit 0 if ord($response) == 3;
+                    exit 0 if ord $response == 3;
 
                     say $response;
                     $response = lc($response);
diff --git a/lib/App/annex_to_annex_reinject.pm b/lib/App/annex_to_annex_reinject.pm
index 5a0296f..e28e3c5 100644
--- a/lib/App/annex_to_annex_reinject.pm
+++ b/lib/App/annex_to_annex_reinject.pm
@@ -29,6 +29,7 @@ use File::Path qw(rmtree);
 use File::Spec::Functions qw(rel2abs);
 use File::Find;
 use Try::Tiny;
+use File::Temp qw(tempdir);
 
 exit main() unless caller;