Merge pull request #22 from KusionStack/fix-unsupport-source-bug

fix: unsupport source when reinstall

Author: elliotxx

pkg/commands/root.go

@@ -27,17 +27,28 @@ var (
 func init() {
 	logger = logrus.New()
 
+	var err error
+
+	homedir, err = os.UserHomeDir()
+	if err != nil {
+		logger.Fatal(err)
+	}
+
 	// Init release sources
 	registedReleaseSources = map[string]sources.ReleaseSource{
 		github.GithubReleaseSource.GetName(): github.GithubReleaseSource,
 		cdn.CDNReleaseSource.GetName():       cdn.CDNReleaseSource,
 	}
 
-	var err error
-
-	homedir, err = os.UserHomeDir()
-	if err != nil {
-		logger.Fatal(err)
+	// Init custom sources from configuration file
+	defaultCustomSourcesFile := KusionupDir(DefaultCustomSourceConfigFilename)
+	if config.IsValidConfigFilename(defaultCustomSourcesFile) {
+		sources := &CustomSources{}
+		if err := config.FromFile(afero.NewOsFs(), defaultCustomSourcesFile, sources); err == nil {
+			for i := 0; i < len(sources.Sources); i++ {
+				registedReleaseSources[sources.Sources[i].Name] = &sources.Sources[i]
+			}
+		}
 	}
 
 	ProfileFiles = []string{
@@ -76,24 +87,21 @@ func preRunRoot(_ *cobra.Command, _ []string) error {
 		logger.SetLevel(logrus.DebugLevel)
 	}
 
-	if customSourcesFile == "" {
-		customSourcesFile = KusionupDir(DefaultCustomSourceConfigFilename)
-	}
-
-	// Init custom sources from profile file
-	if config.IsValidConfigFilename(customSourcesFile) {
-		sources := &CustomSources{}
-
-		err := config.FromFile(afero.NewOsFs(), customSourcesFile, sources)
-		if err != nil && customSourcesFile != KusionupDir(DefaultCustomSourceConfigFilename) {
-			logger.Printf("Failed to load custom sources from %s: %s\n", customSourcesFile, err)
-		} else {
-			for i := 0; i < len(sources.Sources); i++ {
-				registedReleaseSources[sources.Sources[i].Name] = &sources.Sources[i]
+	if customSourcesFile != "" {
+		if config.IsValidConfigFilename(customSourcesFile) {
+			sources := &CustomSources{}
+
+			err := config.FromFile(afero.NewOsFs(), customSourcesFile, sources)
+			if err != nil {
+				logger.Printf("Failed to load custom sources from %s: %s\n", customSourcesFile, err)
+			} else {
+				for i := 0; i < len(sources.Sources); i++ {
+					registedReleaseSources[sources.Sources[i].Name] = &sources.Sources[i]
+				}
 			}
+		} else {
+			logger.Printf("Invalid custom sources file: %s\n", customSourcesFile)
 		}
-	} else {
-		logger.Printf("Invalid custom sources file: %s\n", customSourcesFile)
 	}
 
 	return nil