From f7cefb8a52e3c156eebc33bd984f3fcad3872f99 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Sun, 5 Oct 2014 17:59:49 +0900 Subject: [PATCH] emacs.el: Use wget if possible to download file --- emacs.el | 61 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/emacs.el b/emacs.el index 6ef5050..f5a0cbf 100644 --- a/emacs.el +++ b/emacs.el @@ -77,29 +77,44 @@ If FORCE-DOWNLOAD-P it t ignore exisiting library and always download." (defun download-file (url path &optional ok-if-already-exists) "Download file from URL and output to PATH. IF OK-IF-ALREADY-EXISTS is true force download." - (or - (let ((curl (executable-find "curl"))) - (when curl - (if (and (not ok-if-already-exists) - (file-exists-p path)) - nil - (and (eq 0 - (call-process curl - nil - nil - nil - "--output" - path - "-L" - url - )) - path)))) - (ignore-errors - (require 'url) - (url-copy-file url - path - ok-if-already-exists) - path))) + (let ((curl (executable-find "curl")) + (wget (executable-find "wget"))) + (cond (wget + (if (and (not of-if-already-exists) + (file-exists-p path)) + nil + (and (eq 0 + (call-process curl + nil + nil + nil + "-O" + path + url + )) + path))) + (curl + (if (and (not ok-if-already-exists) + (file-exists-p path)) + nil + (and (eq 0 + (call-process curl + nil + nil + nil + "--output" + path + "-L" + url + )) + path))) + (t + (ignore-errors + (require 'url) + (url-copy-file url + path + ok-if-already-exists) + path))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; package