branch: elpa-admin
commit aa346f037bf40451dbf132f7101d73d31e95070a
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>
* 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 +-----
2 files changed, 8 insertions(+), 12 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.
