diff --git a/file_processing/archive_statements.pl b/file_processing/archive_statements.pl index 85602f0..29d4c07 100755 --- a/file_processing/archive_statements.pl +++ b/file_processing/archive_statements.pl @@ -1,8 +1,5 @@ -#!/usr/bin/env perl +#!/usr/bin/perl use Modern::Perl; - -use FindBin qw($Bin); -use lib "$Bin/lib"; use ProcessDirectories; # 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'; -ProcessDirectories::create_archive_dirs ( $financial_folder, $lastyear_folder ); +create_archive_dirs ( $financial_folder, $lastyear_folder ); # Make sure contents match before we do any deleting # croak on errors to guard against data loss # 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 # 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 ); diff --git a/file_processing/archive_taxes.pl b/file_processing/archive_taxes.pl index 2c5ca81..cff31e3 100755 --- a/file_processing/archive_taxes.pl +++ b/file_processing/archive_taxes.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl use Modern::Perl; use Time::Piece; diff --git a/solus_utility/solus_goto_oct.sh b/solus_utility/solus_goto_oct.sh index bd98175..2225d27 100755 --- a/solus_utility/solus_goto_oct.sh +++ b/solus_utility/solus_goto_oct.sh @@ -5,12 +5,11 @@ function update_repos() { printf "[INFO] Updating the Solus package repo\n" gotosoluspkgs - git stash git switch main git fetch && git pull printf "[INFO] Updating the Solus infrastructure-tooling repo \n" - cd ../infrastructure-tooling + cd infrastructure-tooling git switch master git fetch && git pull