scripts/feeds: display "X" as revision of uninitialized feeds

[librecmc/librecmc.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 55a8dd94ea76da13ff794c93142f3502d6f96c62..45239af1a3371d4ba203244af759d9db54e648a9 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -333,7 +333,7 @@ sub list {
                        my $localpath = "./feeds/$feed->[1]";
                        my $m = $update_method{$feed->[0]};
                        my $revision;
-                       if( !$m->{'revision'} ) {
+                       if (!-d "$localpath" || !$m->{'revision'}) {
                                $revision = "X";
                        }
                        elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {
@@ -354,7 +354,7 @@ sub list {
                                printf "%s %s %s\n", $feed->[0], $feed->[1], $uri;
                        }
                        else {
-                               printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
+                               printf "\%-10s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
                        }
                }
                return 0;
@@ -534,6 +534,11 @@ sub install_package {
 sub refresh_config {
        my $default = shift;
 
+       # Don't create .config if it doesn't already exist so that making a
+       # config only occurs when the user intends it do (however we do
+       # want to refresh an existing config).
+       return if not (-e '.config');
+
        # workaround for timestamp check
        system("rm -f tmp/.packageinfo");