Compare commits

..

No commits in common. "ef0a2367ebbd49ad4295475679e6b8a6137bc793" and "3b7e6434b9af8b1cc6a82025b454e4021a59e4be" have entirely different histories.

3 changed files with 6 additions and 10 deletions

View file

@ -1,8 +1,5 @@
#!/usr/bin/env perl #!/usr/bin/perl
use Modern::Perl; use Modern::Perl;
use FindBin qw($Bin);
use lib "$Bin/lib";
use ProcessDirectories; use ProcessDirectories;
# Script to archive the financial data from the previous year # Script to archive the financial data from the previous year
@ -25,14 +22,14 @@ my $financial_archive_folder = '/home/tracey/Documents/financial/1_financial_arc
my $lastyear_folder = $financial_archive_folder . $lastyear . '_FinancialArchives'; my $lastyear_folder = $financial_archive_folder . $lastyear . '_FinancialArchives';
ProcessDirectories::create_archive_dirs ( $financial_folder, $lastyear_folder ); create_archive_dirs ( $financial_folder, $lastyear_folder );
# Make sure contents match before we do any deleting # Make sure contents match before we do any deleting
# croak on errors to guard against data loss # croak on errors to guard against data loss
# my $same_result = compare_dirs( $financial_folder, $lastyear_folder ); # my $same_result = compare_dirs( $financial_folder, $lastyear_folder );
croak "Error: The source and destintion folder contents are not the same!" unless ( ProcessDirectories::compare_dirs( $financial_folder, $lastyear_folder ) ); croak "Error: The source and destintion folder contents are not the same!" unless ( compare_dirs( $financial_folder, $lastyear_folder ) );
# Delete all files from current year from archive folders # Delete all files from current year from archive folders
# Also delete files from last year in current year folder # Also delete files from last year in current year folder
ProcessDirectories::clean_dirs( $financial_folder, $lastyear_folder, $year, $lastyear ); clean_dirs( $financial_folder, $lastyear_folder, $year, $lastyear );

View file

@ -1,4 +1,4 @@
#!/usr/bin/env perl #!/usr/bin/perl
use Modern::Perl; use Modern::Perl;
use Time::Piece; use Time::Piece;

View file

@ -5,12 +5,11 @@
function update_repos() { function update_repos() {
printf "[INFO] Updating the Solus package repo\n" printf "[INFO] Updating the Solus package repo\n"
gotosoluspkgs gotosoluspkgs
git stash
git switch main git switch main
git fetch && git pull git fetch && git pull
printf "[INFO] Updating the Solus infrastructure-tooling repo \n" printf "[INFO] Updating the Solus infrastructure-tooling repo \n"
cd ../infrastructure-tooling cd infrastructure-tooling
git switch master git switch master
git fetch && git pull git fetch && git pull