replace the deprecated git-* command calls with git *

[openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 6b09f7e..8e18855 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -23,7 +23,9 @@ sub parse_config() {
        my $line = 0;
        my %name;
 
        my $line = 0;
        my %name;
 

-       open FEEDS, "feeds.conf";
+       open FEEDS, "feeds.conf" or
+               open FEEDS, "feeds.conf.default" or
+               die "Unable to open feeds configuration";

        while (<FEEDS>) {
                chomp;
                s/#.+$//;
        while (<FEEDS>) {
                chomp;
                s/#.+$//;


@@ -100,7 +102,7 @@ sub update_git($$) {
                system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
        } else {
                system("rm -rf \"./feeds/$name\"");
                system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
        } else {
                system("rm -rf \"./feeds/$name\"");

-               system("git-clone --depth 1 $src ./feeds/$name") == 0 or return 1;
+               system("git clone --depth 1 $src ./feeds/$name") == 0 or return 1;

        }
 
        return 0;
        }
 
        return 0;