diff --git a/file_processing/archive_statements.pl b/file_processing/archive_statements.pl index 29d4c07..85602f0 100755 --- a/file_processing/archive_statements.pl +++ b/file_processing/archive_statements.pl @@ -1,5 +1,8 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use Modern::Perl; + +use FindBin qw($Bin); +use lib "$Bin/lib"; use ProcessDirectories; # Script to archive the financial data from the previous year @@ -22,14 +25,14 @@ my $financial_archive_folder = '/home/tracey/Documents/financial/1_financial_arc my $lastyear_folder = $financial_archive_folder . $lastyear . '_FinancialArchives'; -create_archive_dirs ( $financial_folder, $lastyear_folder ); +ProcessDirectories::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 ( 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 ) ); # Delete all files from current year from archive folders # Also delete files from last year in current year folder -clean_dirs( $financial_folder, $lastyear_folder, $year, $lastyear ); +ProcessDirectories::clean_dirs( $financial_folder, $lastyear_folder, $year, $lastyear ); diff --git a/file_processing/archive_taxes.pl b/file_processing/archive_taxes.pl index cff31e3..2c5ca81 100755 --- a/file_processing/archive_taxes.pl +++ b/file_processing/archive_taxes.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use Modern::Perl; use Time::Piece; diff --git a/solus_utility/solus_goto_oct.sh b/solus_utility/solus_goto_oct.sh index 2225d27..bd98175 100755 --- a/solus_utility/solus_goto_oct.sh +++ b/solus_utility/solus_goto_oct.sh @@ -5,11 +5,12 @@ 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