From 2f545c7fdc00c501fc2ae2f870ca016748e56000 Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Sun, 19 Aug 2018 05:53:32 +0100
Subject: [PATCH] Correctly set config.AURURL after parsing flags

And also honour aururl during -Pc
---
 completions.go |  2 +-
 main.go        | 10 ----------
 parser.go      |  5 +++++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/completions.go b/completions.go
index 2a83f2ff..96d9a2da 100644
--- a/completions.go
+++ b/completions.go
@@ -13,7 +13,7 @@ import (
 
 //CreateAURList creates a new completion file
 func createAURList(out *os.File) (err error) {
-	resp, err := http.Get("https://aur.archlinux.org/packages.gz")
+	resp, err := http.Get(config.AURURL + "/packages.gz")
 	if err != nil {
 		return err
 	}
diff --git a/main.go b/main.go
index 5198abf8..53a6db58 100644
--- a/main.go
+++ b/main.go
@@ -4,13 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
-	"net/url"
 
 	alpm "github.com/jguer/go-alpm"
-	rpc "github.com/mikkeloscar/aur"
 )
 
 func setPaths() error {
@@ -50,13 +47,6 @@ func initConfig() error {
 		}
 	}
 
-	url, err := url.Parse(config.AURURL)
-	if err != nil {
-		return err
-	}
-	url.Path = path.Join(url.Path, "")
-	rpc.AURURL = url.String() + "/rpc.php?"
-
 	return nil
 }
 
diff --git a/parser.go b/parser.go
index bc25a387..6cbdcf00 100644
--- a/parser.go
+++ b/parser.go
@@ -9,6 +9,8 @@ import (
 	"strconv"
 	"strings"
 	"unicode"
+
+	rpc "github.com/mikkeloscar/aur"
 )
 
 // A basic set implementation for strings.
@@ -873,6 +875,9 @@ func (parser *arguments) extractYayOptions() {
 			parser.delArg(option)
 		}
 	}
+
+	rpc.AURURL = strings.TrimRight(config.AURURL, "/") + "/rpc.php?"
+	config.AURURL = strings.TrimRight(config.AURURL, "/")
 }
 
 //parses input for number menus splitted by spaces or commas