From b9917fc56022f55d4c9b958fa7a0a543ec69fa22 Mon Sep 17 00:00:00 2001 From: malahx Date: Fri, 3 Apr 2015 22:54:52 +0200 Subject: [PATCH 1/2] add -force argument --- PRNLs/pruner.pl | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/PRNLs/pruner.pl b/PRNLs/pruner.pl index 2ab9166..9eaa1f1 100755 --- a/PRNLs/pruner.pl +++ b/PRNLs/pruner.pl @@ -18,21 +18,33 @@ sub main { my @args = @_; - - if (@args !=2 && @args !=1) + my $force = 0; + if (@args !=3 && @args !=2 && @args !=1) { - say "\nTo prune : $0 -prune prunelist"; - say "To unprune : $0 -unprune prunelist"; + say "\nTo prune : $0 [-force] -prune prunelist"; + say "To unprune : $0 [-force] -unprune prunelist"; say "To view prunelists : $0 -list\n"; return EXIT_BADOPT; } elsif (@args ==1 && $args[0] ne '-list') { - say "\nTo prune : $0 -prune prunelist"; - say "To unprune : $0 -unprune prunelist\n"; + say "\nTo prune : $0 [-force] -prune prunelist"; + say "To unprune : $0 [-force] -unprune prunelist\n"; say "To view prunelists : $0 -list\n"; return EXIT_BADOPT; } + elsif (@args ==3 && $args[0] ne '-force') + { + say "\nTo prune : $0 [-force] -prune prunelist"; + say "To unprune : $0 [-force] -unprune prunelist"; + say "To view prunelists : $0 -list\n"; + return EXIT_BADOPT; + } + if ($args[0] eq '-force') + { + shift(@args); + $force = 1; + } my $action = $args[0]; my $prunelist = $args[1]; my $BaseDir = 'GameData'; @@ -80,15 +92,19 @@ sub main { } else { - die "Usage: $0 [-prune|-unprune] prunelist | -list\n"; + die "Usage: $0 [-force] [-prune|-unprune] prunelist | -list\n"; } print join("\n",@prunearray); - printf "\n\n\tProceed (up to %d files to rename)?\n\n\t [ Y / N ]?", scalar @files; - chomp(my $key = ); ## no critic 'ProhibitExplicitStdin' - - if ($key eq 'y' || $key eq 'Y') + my $key = 'N'; + printf "\n\n\tProceed (up to %d files to rename)", scalar @files; + if (!$force) + { + print "?\n\n\t [ Y / N ]?"; + chomp($key = ); ## no critic 'ProhibitExplicitStdin' + } + if ($key eq 'y' || $key eq 'Y' || $force) { - print "-----Executing-----\n\n"; + print "\n-----Executing-----\n\n"; chdir($dir); # Work from GameData From 8f0b57c72109efd71ce33fa09f93b5025a740214 Mon Sep 17 00:00:00 2001 From: malahx Date: Fri, 3 Apr 2015 23:00:23 +0200 Subject: [PATCH 2/2] add -force argument --- PRNLs/pruner.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/PRNLs/pruner.pl b/PRNLs/pruner.pl index 9eaa1f1..c5bf762 100755 --- a/PRNLs/pruner.pl +++ b/PRNLs/pruner.pl @@ -35,16 +35,16 @@ sub main { } elsif (@args ==3 && $args[0] ne '-force') { - say "\nTo prune : $0 [-force] -prune prunelist"; + say "\nTo prune : $0 [-force] -prune prunelist"; say "To unprune : $0 [-force] -unprune prunelist"; say "To view prunelists : $0 -list\n"; return EXIT_BADOPT; - } + } if ($args[0] eq '-force') - { - shift(@args); - $force = 1; - } + { + shift(@args); + $force = 1; + } my $action = $args[0]; my $prunelist = $args[1]; my $BaseDir = 'GameData'; @@ -96,12 +96,12 @@ sub main { } print join("\n",@prunearray); my $key = 'N'; - printf "\n\n\tProceed (up to %d files to rename)", scalar @files; + printf "\n\n\tProceed (up to %d files to rename)", scalar @files; if (!$force) { - print "?\n\n\t [ Y / N ]?"; - chomp($key = ); ## no critic 'ProhibitExplicitStdin' - } + print "?\n\n\t [ Y / N ]?"; + chomp($key = ); ## no critic 'ProhibitExplicitStdin' + } if ($key eq 'y' || $key eq 'Y' || $force) { print "\n-----Executing-----\n\n";