gitback/el-get
1
0
Fork 0
mirror of https://github.com/dimitri/el-get.git synced 2024-09-29 04:58:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix filename from url handling, and fix the ack recipe to use a :localname.

Browse Source
This commit is contained in:
Dimitri Fontaine 2011-08-16 16:26:18 +02:00
parent ad222b13ca
commit 9dbd25f1c5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
el-get.el
View File

@ -1883,6 +1883,13 @@ the recipe, then return nil."
;;
;; http support
;;
(defun el-get-filename-from-url (url)
"return a suitable filename from given url
Test url: http://repo.or.cz/w/ShellArchive.git?a=blob_plain;hb=HEAD;f=ack.el"
(replace-regexp-in-string "[^a-zA-Z0-9-_\.]" "_"
(file-name-nondirectory url)))
(defun el-get-http-retrieve-callback (status package post-install-fun &optional dest sources)
"Callback function for `url-retrieve', store the emacs lisp file for the package."
(let* ((pdir (el-get-package-directory package))
@ -1911,7 +1918,7 @@ Should dest be omitted (nil), the url content will get written
into the package :localname option or its `file-name-nondirectory' part."
(let* ((pdir (el-get-package-directory package))
(fname (or (plist-get (el-get-package-def package) :localname)
(file-name-nondirectory url)))
(el-get-filename-from-url url)))
(dest (or dest
(concat (file-name-as-directory pdir) fname))))
(unless (file-directory-p pdir)
@ -2007,7 +2014,7 @@ that"
the files up."
(let* ((pdir (el-get-package-directory package))
(url (plist-get (el-get-package-def package) :url))
(tarfile (file-name-nondirectory url))
(tarfile (el-get-filename-from-url url))
(files (remove tarfile (directory-files pdir nil "[^.]$")))
(dir (car files)))
;; if there's only one directory, move its content up and get rid of it
@ -2029,7 +2036,7 @@ the files up."
(let* ((source (el-get-package-def package))
(options (plist-get source :options))
(pdir (el-get-package-directory package))
(tarfile (file-name-nondirectory url))
(tarfile (el-get-filename-from-url url))
(dest (concat (file-name-as-directory pdir) tarfile))
(name (format "*tar %s %s*" options url))
(ok (format "Package %s installed." package))

2
recipes/ack.el
View File

@ -1,6 +1,6 @@
(:name ack
:type http
:localname "ack.el"
:url "http://repo.or.cz/w/ShellArchive.git?a=blob_plain;hb=HEAD;f=ack.el"
:description "Use ack where you might usually use grep."
:build '("mv ShellArchive*ack.el ack.el")
:features ack)