Feature/multiple-binary

README.md

@@ -36,6 +36,8 @@ curl https://i.jpillora.com/<query>! | bash
     * `type=homebrew` is **not** working at the moment – see [Homebrew](#homebrew)
 * `?insecure=1` Force `curl`/`wget` to skip certificate checks
 * `?as=` Force the binary to be named as this parameter value
+* `?select=` Select binary, if **repository name** and **binary name** in release differs.
+    * **eg**: repo_name is **foobar** and binary name is **fb-client** and **fb-server** in release, Then `?select=fb-client` & `?select=fb-server` accordingly.
 
 ## Security
 

handler/handler.go

@@ -31,9 +31,9 @@ var (
 )
 
 type Query struct {
-	User, Program, AsProgram, Release string
-	MoveToPath, Search, Insecure      bool
-	SudoMove                          bool // deprecated: not used, now automatically detected
+	User, Program, AsProgram, Selected, Release string
+	MoveToPath, Search, Insecure                bool
+	SudoMove                                    bool // deprecated: not used, now automatically detected
 }
 
 type Result struct {
@@ -110,6 +110,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		User:      "",
 		Program:   "",
 		Release:   "",
+		Selected:  r.URL.Query().Get("select"),
 		Insecure:  r.URL.Query().Get("insecure") == "1",
 		AsProgram: r.URL.Query().Get("as"),
 	}
@@ -124,6 +125,11 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	q.User, rest = splitHalf(path, "/")
 	q.Program, q.Release = splitHalf(rest, "@")
 	// no program? treat first part as program, use default user
+
+	if q.AsProgram == "" && q.Selected != "" {
+		q.AsProgram = q.Selected
+	}
+
 	if q.Program == "" {
 		q.Program = q.User
 		q.User = h.Config.User

handler/handler_execute.go

@@ -117,6 +117,14 @@ func (h *Handler) getAssetsNoCache(q Query) (string, Assets, error) {
 		//only binary containers are supported
 		//TODO deb,rpm etc
 		fext := getFileExt(url)
+
+		if q.Selected != "" {
+			//filter binary with it's name
+			if !strings.Contains(ga.Name[0:len(q.Selected)+1], fmt.Sprint(q.Selected, "-")) {
+				continue
+			}
+		}
+
 		if fext == "" && ga.Size > 1024*1024 {
 			fext = ".bin" // +1MB binary
 		}

scripts/install.sh.tmpl

@@ -17,6 +17,7 @@ function install {
 	#settings
 	USER="{{ .User }}"
 	PROG="{{ .Program }}"
+	SEL_BIN="{{ .Selected }}"
 	ASPROG="{{ .AsProgram }}"
 	MOVE="{{ .MoveToPath }}"
 	RELEASE="{{ .Release }}"
@@ -93,6 +94,9 @@ function install {
 	#got URL! download it...
 	echo -n "{{ if .MoveToPath }}Installing{{ else }}Downloading{{ end }}"
 	echo -n " $USER/$PROG"
+	if [ ! -z "$SEL_BIN" ]; then
+		echo -n "/$SEL_BIN"
+	fi
 	if [ ! -z "$RELEASE" ]; then
 		echo -n " $RELEASE"
 	fi

scripts/install.txt.tmpl

@@ -1,6 +1,7 @@
 repository: https://github.com/{{ .User }}/{{ .Program }}
 user: {{ .User }}
-program: {{ .Program }}{{if .AsProgram }}
+program: {{ .Program }}{{if .Selected }}
+selected-binary: {{.Selected}}{{end}}{{if .AsProgram }}
 as: {{ .AsProgram }}{{end}}
 release: {{ .Release }}
 move-into-path: {{ .MoveToPath }}