branch: master
commit a8621cd0760980ce8213ea04ad9dc5cf74b7594e
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* GNUmakefile (org-fetch): Use https and stick to wget
* README: org-synch.sh is not used.
* admin/org-synch.el, admin/org-synch.sh: Remove.
---
GNUmakefile | 14 +++++++-------
README | 6 +-----
admin/org-synch.el | 22 ----------------------
admin/org-synch.sh | 43 -------------------------------------------
4 files changed, 8 insertions(+), 77 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 4be6367..037fbb6 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -88,13 +88,13 @@ archive-full: archive-tmp org-fetch
# FIXME: Turn it into an `external', which will require adding the notion of
# "snapshot" packages.
org-fetch: archive-tmp
- -cd $(ARCHIVE_TMP)/packages &&
\
- pkgname=`curl -s http://orgmode.org/elpa/|perl -ne 'push @f, $$1 if
m/(org-\d{8})\.tar/; END { @f = sort @f; print "$$f[-1]\n"}'`; \
- wget -q http://orgmode.org/elpa/$${pkgname}.tar -O $${pkgname}.tar;
\
- if [ -f $${pkgname}.tar ]; then
\
- tar xf $${pkgname}.tar;
\
- rm -f $${pkgname}.tar;
\
- mv $${pkgname} org;
\
+ -cd $(ARCHIVE_TMP)/packages &&
\
+ pkgname=`wget -q -O- https://orgmode.org/elpa/|perl -ne 'push @f, $$1
if m/(org-\d{8})\.tar/; END { @f = sort @f; print "$$f[-1]\n"}'`; \
+ wget -q https://orgmode.org/elpa/$${pkgname}.tar -O $${pkgname}.tar;
\
+ if [ -f $${pkgname}.tar ]; then
\
+ tar xf $${pkgname}.tar;
\
+ rm -f $${pkgname}.tar;
\
+ mv $${pkgname} org;
\
fi
clean:
diff --git a/README b/README
index 067f4c7..a1d6fd3 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Copyright (C) 2010-2011, 2014-2017 Free Software Foundation, Inc.
+Copyright (C) 2010-2011, 2014-2018 Free Software Foundation, Inc.
See the end of the file for license conditions.
@@ -305,10 +305,6 @@ admins), and
Which makes a full archive deployment, as discussed above. The symlink
/var/www/packages points to the staging package directory under
/home/elpa/.
-
-The Org mode dailies are also fetched and added by the script
-admin/org-synch.sh, run as a cron job.
-
This file is part of GNU Emacs.
diff --git a/admin/org-synch.el b/admin/org-synch.el
deleted file mode 100644
index cc7e923..0000000
--- a/admin/org-synch.el
+++ /dev/null
@@ -1,22 +0,0 @@
-(defun org-synch (package-file)
- (let* ((archive-file "archive-contents")
- (package-name 'org)
- (date (substring package-file 4 12))
- (date-int (string-to-number date))
- contents entry)
- (unless (and (integerp date-int)
- (> date-int 20100000)
- (< date-int 21000000))
- (error "Package date is bad"))
- (unless (file-exists-p package-file)
- (error "No package file found"))
- (when (file-exists-p archive-file)
- (find-file archive-file)
- (setq contents (read (current-buffer))
- entry (assq package-name contents))
- (unless entry
- (error "No entry for %s in archive-contents" package-name))
- (aset (cdr entry) 0 (version-to-list date))
- (erase-buffer)
- (insert (pp-to-string contents) "\n")
- (save-buffer 0))))
diff --git a/admin/org-synch.sh b/admin/org-synch.sh
deleted file mode 100755
index 6ca8880..0000000
--- a/admin/org-synch.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# TODO: Author
-# TODO: License
-##
-# Usage: org-sync.sh DOWNLOAD-DIR ADMIN-DIR
-#
-# This script first determines the latest org-mode tarball
-# by screen-scraping <http://orgmode.org/elpa/>. Next, it
-# changes directory to DOWNLOAD-DIR and fetches the tarball.
-# If successful, it passes control to the Emacs Lisp program
-# ADMIN-DIR/org-sync.el (func ‘org-sync’) to finish the job.
-#
-# Preconditions:
-# - Installed software: perl, wget, emacs.
-# - Internet connection (i.e., can access orgmode.org over HTTP).
-# - DOWNLOAD-DIR exists and rw.
-# - ADMIN-DIR exists and readable.
-##
-# [NB: I inferred these from VCS logs. Corrections welcome! --ttn]
-# 0.x -- release from the previous VCS
-# 1.0 -- initial release from this VCS (Git)
-# 1.1 -- support ‘--help’, ‘--version’
-# 1.2 -- no longer require curl; performance tweak
-version='1.2'
-# If $0 is a symlink, `dirname $0`/hv.sh might not be available,
-# and even if it IS available, how can we be sure it's bonafide?
-test -L $0 || { hv=`dirname $0`/hv.sh ; test -r $hv && . $hv ; }
-
-# TODO: (here) Validate args.
-
-PATH="/bin:/usr/bin:/usr/local/bin:${PATH}"
-
-pkgname=`wget -q http://orgmode.org/elpa/ -O-|perl -ne '$n = $1 if
(m/(org-\d{8}\.tar)/ && $1 gt $n); END { print "$n" }'`
-
-cd $1
-wget -q http://orgmode.org/elpa/${pkgname} -O ${pkgname}-tmp
-if [ -f ${pkgname}-tmp ]; then
- rm -f org*.tar
- mv ${pkgname}-tmp ${pkgname} && \
- emacs -batch -l $2/org-synch.el --eval "(org-synch \"${pkgname}\")"
-fi
-
-# org-synch.sh ends here
