git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3394 improvements to the file association progress bar
[jalview.git]
/
utils
/
install4j
/
auto_file_associations-i4j8.pl
diff --git
a/utils/install4j/auto_file_associations-i4j8.pl
b/utils/install4j/auto_file_associations-i4j8.pl
index
e091681
..
bf24b11
100755
(executable)
--- a/
utils/install4j/auto_file_associations-i4j8.pl
+++ b/
utils/install4j/auto_file_associations-i4j8.pl
@@
-120,25
+120,16
@@
close(IN);
my %all_associations = (%$file_associations, %$add_associations);
my %all_associations = (%$file_associations, %$add_associations);
-my $num = 0;
-my $i4jcount = 0;
my @ordered = (@put_first, @non_primary);
for my $key (sort keys %all_associations) {
next if grep($_ eq $key, @ordered);
push(@ordered, $key);
}
my @ordered = (@put_first, @non_primary);
for my $key (sort keys %all_associations) {
next if grep($_ eq $key, @ordered);
push(@ordered, $key);
}
-for my $key (@ordered) {
- my $a = $all_associations{$key};
- next if (ref($a) ne "HASH");
-
- my $extensions = $a->{extensions};
- my @extensions = @$extensions;
-
- $num++
-}
+my $num = $#ordered + 1;
warn("--\n");
warn("--\n");
+my $i4jcount = 0;
for my $shortname (@ordered) {
my $a = $all_associations{$shortname};
next if (ref($a) ne "HASH");
for my $shortname (@ordered) {
my $a = $all_associations{$shortname};
next if (ref($a) ne "HASH");
@@
-192,9
+183,9
@@
for my $shortname (@ordered) {
my $ext = join(",",sort(@extensions));
my $xdisplayext = xml_escape(join(", ", map(".$_",sort(@extensions))));
my $ext = join(",",sort(@extensions));
my $xdisplayext = xml_escape(join(", ", map(".$_",sort(@extensions))));
- $i4jcount++;
my $progresspercent = int(($i4jcount/$num)*100);
$progresspercent = 100 if $progresspercent > 100;
my $progresspercent = int(($i4jcount/$num)*100);
$progresspercent = 100 if $progresspercent > 100;
+ $i4jcount++;
my $xext = xml_escape($ext);
my $addunixextension = "true";
my $xext = xml_escape($ext);
my $addunixextension = "true";