Merge pull request profclems#678 from zemzale/fix-override

Fix: Allow for override of repo using OWNER/REPO
bcdady · Apr 9, 2021 · 88b415b · 88b415b
2 parents d6e85bb + 7e9e9e8
commit 88b415b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/cmd/glab/main.go b/cmd/glab/main.go
@@ -45,9 +45,7 @@ func main() {
 
 	cmdFactory := cmdutils.NewFactory()
 
-	if glHostFromEnv := config.GetFromEnv("host"); glHostFromEnv != "" {
-		glinstance.OverrideDefault(glHostFromEnv)
-	}
+	maybeOverrideDefaultHost(cmdFactory)
 
 	if !cmdFactory.IO.ColorEnabled() {
 		surveyCore.DisableColor = true
@@ -179,3 +177,13 @@ func printError(out io.Writer, err error, cmd *cobra.Command, debug bool) {
 		_, _ = fmt.Fprintln(out, cmd.UsageString())
 	}
 }
+
+func maybeOverrideDefaultHost(f *cmdutils.Factory) {
+	baseRepo, err := f.BaseRepo()
+	if err == nil {
+		glinstance.OverrideDefault(baseRepo.RepoHost())
+	}
+	if glHostFromEnv := config.GetFromEnv("host"); glHostFromEnv != "" {
+		glinstance.OverrideDefault(glHostFromEnv)
+	}
+}