projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.131' into dev
[feisty_meow.git]
/
scripts
/
files
/
summing_dir.pl
diff --git
a/scripts/files/summing_dir.pl
b/scripts/files/summing_dir.pl
index 8c060b1c8333374b6ca587a648bf1510a8eb20e6..5cd9fa6b9b1f27b80b6401d02f38382f3fd30995 100644
(file)
--- a/
scripts/files/summing_dir.pl
+++ b/
scripts/files/summing_dir.pl
@@
-20,7
+20,7
@@
require "filename_helper.pl";
require "filename_helper.pl";
-use Env qw($TMP $color_add $TERM);
+use Env qw($TMP $color_add $
ls_dot_add $
TERM);
local($chewed_line) = "";
local(@arg_list);
local($chewed_line) = "";
local(@arg_list);
@@
-37,7
+37,12
@@
if ($#ARGV < 0) {
@arg_list = &glob_list(@ARGV);
}
@arg_list = &glob_list(@ARGV);
}
+# add parameters to our chewed_line, but skip items if they are flags we don't
+# implement.
foreach $dir (@arg_list) {
foreach $dir (@arg_list) {
+#hmmm: fix this by using a pattern, to exclude cmd line parms, but recognize some of them, like recursive? hmmm.
+ if ($dir eq "-al") { next; } # skip ls directives.
+ if ($dir eq "-l") { next; } # skip ls directives.
$chewed_line = $chewed_line . " \"$dir\"";
}
$chewed_line = $chewed_line . " \"$dir\"";
}
@@
-49,20
+54,16
@@
if ("$chewed_line" eq "") {
# show the header, now that we know there's something to print.
print "[" . $print_list . "]\n\n";
# show the header, now that we know there's something to print.
print "[" . $print_list . "]\n\n";
-##print "chewed_line is: $chewed_line\n";
-
local($temp_file)=`mktemp "$TMP/zz_frdsumdir.XXXXXX"`;
chop($temp_file);
# drop the main payload, the list of directory info, but also save that
# info to a file for analysis.
local($temp_file)=`mktemp "$TMP/zz_frdsumdir.XXXXXX"`;
chop($temp_file);
# drop the main payload, the list of directory info, but also save that
# info to a file for analysis.
-system("ls -
hlF
$color_add $chewed_line");
-system("ls -
hlF
$color_add $chewed_line > $temp_file");
+system("ls -
HhlF $ls_dot_add
$color_add $chewed_line");
+system("ls -
HhlF $ls_dot_add
$color_add $chewed_line > $temp_file");
# the color_add variable, if defined, will have flags for setting the
# directory listing color scheme.
# the color_add variable, if defined, will have flags for setting the
# directory listing color scheme.
-##print "file is: $temp_file\n";
-
local($lengths) = 0;
# open the file and process the lines to get file lengths.
local($lengths) = 0;
# open the file and process the lines to get file lengths.
@@
-72,7
+73,6
@@
$pattern="^[^ ]+ +[^ ]+ +[^ ]+ +[^ ]+ +([0-9.]+[KMG]?).*\$";
foreach $file_line (<DIRLIST>) {
if ($file_line =~ /$pattern/) {
(local $munged = $file_line) =~ s/$pattern/\1/;
foreach $file_line (<DIRLIST>) {
if ($file_line =~ /$pattern/) {
(local $munged = $file_line) =~ s/$pattern/\1/;
- #print "munge=$munged\n";
if ($munged =~ /K$/) {
chop $munged;
$munged *= 1024.0;
if ($munged =~ /K$/) {
chop $munged;
$munged *= 1024.0;
@@
-94,14
+94,22
@@
foreach $file_line (<DIRLIST>) {
close(DIRLIST);
unlink($temp_file); # clean up.
close(DIRLIST);
unlink($temp_file); # clean up.
-#print "lens are: $lengths\n";
-
local($total)=int($lengths);
local($kbytes)=int($total / 102.4) / 10;
local($mbytes)=int($kbytes / 102.4) / 10;
local($total)=int($lengths);
local($kbytes)=int($total / 102.4) / 10;
local($mbytes)=int($kbytes / 102.4) / 10;
+local($gbytes)=int($mbytes / 102.4) / 10;
print "\n";
print "\n";
-print "These files occupy $total bytes ($kbytes KB / $mbytes MB).\n";
+# print a fancy listing showing bytes at least, but only showing mb and gb if appropriate.
+print "These files occupy $total bytes ($kbytes KB";
+if ($mbytes ne 0) {
+ print " / $mbytes MB";
+}
+if ($gbytes ne 0) {
+ print " / $gbytes GB";
+}
+print ").\n";
+
print "Overall Drive Usage (megs):\n";
system("df -m $chewed_line >$temp_file");
print "Overall Drive Usage (megs):\n";
system("df -m $chewed_line >$temp_file");