CLI cleanups

diff --git a/rsbs2.pl b/rsbs2.pl
index 0843330fb25edf6c3397d5015d5fb92172ac3d94..2d7ec2a9ec8f7d0db9fe6088051073991e87a73c 100755 (executable)
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -196,8 +196,10 @@ sub setprop {
 
        if ($res->{RESP}->{RC} ne '0x0') {
                print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
 
        if ($res->{RESP}->{RC} ne '0x0') {
                print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";

+               undef;

        } else {
        } else {

-               print "${property}: ${oldval} -> ${value}\n";
+               print "${property}: ${oldval} -> ${value}\n" if ($verbose);
+               $oldval;

        }
 }
 
        }
 }
 


@@ -480,7 +482,10 @@ if (@gprop) {
 if (@sprop) {
        foreach my $p (@sprop) {
                (my $pr, $v) = split(/=/,$p,2);
 if (@sprop) {
        foreach my $p (@sprop) {
                (my $pr, $v) = split(/=/,$p,2);

-               setprop($pr, $v);
+               my $oldval = setprop($pr, $v);
+               if (defined($oldval)) {
+                       print "${pr}: ${oldval} -> ${v}\n" if (!$verbose);
+               }

        }
 }
 
        }
 }
 


@@ -496,6 +501,7 @@ if ($save ne '') {
        LAST_IP_ADDRESS LAST_NETMASK);
 
        open (SAVEFILE, ">${save}") || die "Error opening save-file: $!\n";
        LAST_IP_ADDRESS LAST_NETMASK);
 
        open (SAVEFILE, ">${save}") || die "Error opening save-file: $!\n";

+       print STDERR "saving" if (!$verbose);

        foreach my $ts (@fw_vars) {
                next if (grep(/^${ts}$/, @dontsave));
 
        foreach my $ts (@fw_vars) {
                next if (grep(/^${ts}$/, @dontsave));
 


@@ -503,18 +509,23 @@ if ($save ne '') {
                next if ($phash->{PERMS} ne 'RW');
                
                print SAVEFILE "${ts}=".$phash->{VAL}."\n";
                next if ($phash->{PERMS} ne 'RW');
                
                print SAVEFILE "${ts}=".$phash->{VAL}."\n";

+               print STDERR "." if (!$verbose);

        }
        close(SAVEFILE);
        }
        close(SAVEFILE);

+       print STDERR "done\n" if (!$verbose);

 }
 
 if ($load ne '') {
        open (LOADFILE, "<${load}") || die "Error opening load-file: $!\n";
 }
 
 if ($load ne '') {
        open (LOADFILE, "<${load}") || die "Error opening load-file: $!\n";

+       print STDERR "loading" if (!$verbose);

        while(<LOADFILE>) {
                chomp;
                (my $p, my $v) = split(/=/, $_);
                setprop($p, $v);
        while(<LOADFILE>) {
                chomp;
                (my $p, my $v) = split(/=/, $_);
                setprop($p, $v);

+               print STDERR "." if (!$verbose);

        }
        close(LOADFILE);
        }
        close(LOADFILE);

+       print STDERR "done\n" if (!$verbose);

        print "Settings loaded, resetting board...\n";
        my $reqstr='<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="boardreset"></REQ></RMCSEQ>';
        _req($reqstr);
        print "Settings loaded, resetting board...\n";
        my $reqstr='<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="boardreset"></REQ></RMCSEQ>';
        _req($reqstr);