Tidy minor details

Update copyright notice and rearrange test configuration to follow the
locations of files in lifecycle order.

diff --git a/upload-ftp-v1.2.pl b/upload-ftp-v1.2.pl
index 7553478a118b20d4faa80b0d2cca164e9380e6dd..96247397167d9d80efd02ea1dc08fdd6523b8bab 100755 (executable)
--- a/upload-ftp-v1.2.pl
+++ b/upload-ftp-v1.2.pl
@@ -134,7 +134,7 @@ my $VERSION = '1.2'; # This is the protocol version
 my $DATE = '2017/09/14 12:42:38';
 my $COPYRIGHT_NOTICE = <<'END';
 Copyright (C) 2003-2017 Free Software Foundation <sysadmin@gnu.org>
-Copyright (C) 2020 Jacob Bachmeyer <jcb@gnu.org>
+Copyright (C) 2020-2021 Jacob Bachmeyer <jcb@gnu.org>
 END
 my $LICENSE = "GPLv3 or later - http://www.fsf.org/licenses/gpl.txt";
 my $URL = "http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html";
@@ -244,9 +244,9 @@ if (IN_TEST_MODE) { # override the above for testing
     $package_config_base = File::Spec->catdir($basedir, 'packages');
     $incoming_dir = File::Spec->catdir($basedir, 'incoming');
     $incoming_tmp = File::Spec->catdir($basedir, 'in-stage');
+    $desttmp = File::Spec->catdir($basedir, 'stage');
     $destfinal = File::Spec->catdir($basedir, 'pub');
     $olddestfinal = File::Spec->catdir($basedir, 'archive');
-    $desttmp = File::Spec->catdir($basedir, 'stage');
   }
   # verify mock gpgv
   {