mirror of
https://github.com/dimitri/el-get.git
synced 2024-09-29 13:08:51 +08:00
Support "user/repo" for pkgname in github-tar/zip recipes
This commit is contained in:
parent
3f539683e6
commit
bb29591fa9
|
@ -20,14 +20,21 @@
|
|||
;; Use :url if provided
|
||||
(plist-get source :url)
|
||||
;; Else generate URL from username, and reponame
|
||||
(let* ((username (el-get-as-string
|
||||
(or (plist-get source :username)
|
||||
(error "Recipe for Github tar package %s needs a username" package))))
|
||||
(let* ((username (plist-get source :username))
|
||||
(reponame (el-get-as-string
|
||||
(or (plist-get source :pkgname)
|
||||
package)))
|
||||
(branch (or (plist-get source :branch)
|
||||
"master")))
|
||||
;; A slash in the repo name means that it is "user/repo"
|
||||
(when (string-match-p "/" reponame)
|
||||
(let* ((split (split-string reponame "[[:space:]]\\|/" 'omit-nulls)))
|
||||
(assert (= (length split) 2) nil
|
||||
"Github pkgname %s must contain only one slash and no spaces" reponame)
|
||||
(setq username (first split)
|
||||
reponame (second split))))
|
||||
(unless username
|
||||
(error "Recipe for Github-tar package %s needs a username" package))
|
||||
(format "https://github.com/%s/%s/tarball/%s"
|
||||
username reponame branch)))))
|
||||
|
||||
|
|
|
@ -20,14 +20,21 @@
|
|||
;; Use :url if provided
|
||||
(plist-get source :url)
|
||||
;; Else generate URL from username, and reponame
|
||||
(let* ((username (el-get-as-string
|
||||
(or (plist-get source :username)
|
||||
(error "Recipe for Github zip package %s needs a username" package))))
|
||||
(let* ((username (plist-get source :username))
|
||||
(reponame (el-get-as-string
|
||||
(or (plist-get source :pkgname)
|
||||
package)))
|
||||
(branch (or (plist-get source :branch)
|
||||
"master")))
|
||||
;; A slash in the repo name means that it is "user/repo"
|
||||
(when (string-match-p "/" reponame)
|
||||
(let* ((split (split-string reponame "[[:space:]]\\|/" 'omit-nulls)))
|
||||
(assert (= (length split) 2) nil
|
||||
"Github pkgname %s must contain only one slash and no spaces" reponame)
|
||||
(setq username (first split)
|
||||
reponame (second split))))
|
||||
(unless username
|
||||
(error "Recipe for Github-zip package %s needs a username" package))
|
||||
(format "https://github.com/%s/%s/zipball/%s"
|
||||
username reponame branch)))))
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user