From d8fc81d9b0a5082e0156d0e34464ccb6df026fdc Mon Sep 17 00:00:00 2001 From: Tibor Simko Date: Tue, 31 May 2016 17:07:20 +0200 Subject: [PATCH] installation: Invenio hosting of jQuery plugins * FIX Amends installation procedures to download necessary jQuery plugins from Invenio-hosted web site, fixing problems with non-existing Google Code pages. (closes #3620) --- Makefile.am | 14 +++++++------- requirements.txt | 4 ++-- scripts/create-instance.sh | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index bde0aec6ff..3b58cfea69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -143,7 +143,7 @@ install-jquery-plugins: wget -N http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/jquery-ui.min.js && \ wget -N http://invenio-software.org/download/jquery/v1.5/js/jquery.jeditable.mini.js && \ wget -N https://raw.githubusercontent.com/malsup/form/3.51/jquery.form.js --no-check-certificate && \ - wget -N http://jquery-multifile-plugin.googlecode.com/svn-history/r54/trunk/jquery.MultiFile.js && \ + wget -N http://invenio-software.org/download/jquery/jquery.MultiFile.pack.js && \ wget -O jquery.tablesorter.zip http://invenio-software.org/download/jquery/jquery.tablesorter.20111208.zip && \ wget -O uploadify.zip http://invenio-software.org/download/jquery/uploadify-v2.1.4.zip && \ wget -N http://cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js && \ @@ -174,13 +174,13 @@ install-jquery-plugins: rm -f jquery.bookmark.package-1.4.0.zip && \ mkdir -p ${prefix}/var/www/img && \ cd ${prefix}/var/www/img && \ - wget -r -np -nH --cut-dirs=4 -A "png,css" -P jquery-ui/themes http://jquery-ui.googlecode.com/svn/tags/1.8.17/themes/base/ && \ - wget -r -np -nH --cut-dirs=4 -A "png,css" -P jquery-ui/themes http://jquery-ui.googlecode.com/svn/tags/1.8.17/themes/smoothness/ && \ - wget -r -np -nH --cut-dirs=4 -A "png,css" -P jquery-ui/themes http://jquery-ui.googlecode.com/svn/tags/1.8.17/themes/redmond/ && \ + wget http://invenio-software.org/download/jquery/jquery-ui.tar.gz && \ + tar xvfz jquery-ui.tar.gz && \ + rm jquery-ui.tar.gz && \ wget -O datatables_jquery-ui.css https://raw.githubusercontent.com/DataTables/DataTables/1.10.0/media/css/demo_table_jui.css --no-check-certificate && \ - wget -N http://jquery-ui.googlecode.com/svn/tags/1.8.17/themes/redmond/jquery-ui.css && \ - wget -N http://jquery-ui.googlecode.com/svn/tags/1.8.17/demos/images/calendar.gif && \ - wget -r -np -nH --cut-dirs=5 -A "png" http://jquery-ui.googlecode.com/svn/tags/1.8.17/themes/redmond/images/) + cp jquery-ui/themes/redmond/jquery-ui.css . && \ + wget -N http://invenio-software.org/download/jquery/v1.5/img/calendar.gif && \ + cp jquery-ui/themes/redmond/images/*.png .) @echo "***********************************************************" @echo "** The jQuery plugins were successfully installed. **" @echo "***********************************************************" diff --git a/requirements.txt b/requirements.txt index 3bdfb1757b..30c6b55102 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,13 +4,13 @@ rdflib==2.4.2 reportlab==2.5 python-dateutil<=1.9999 python-magic==0.4.2 -http://www.reportlab.com/ftp/pyRXP-1.16-daily-unix.tar.gz +http://invenio-software.org/download/python/pyRXP-1.16-daily-unix.tar.gz numpy==1.7.0 lxml==3.1.2 mechanize==0.2.5 python-Levenshtein==0.10.2 PyStemmer==1.3.0 -https://py-editdist.googlecode.com/files/py-editdist-0.3.tar.gz +http://invenio-software.org/download/python/py-editdist-0.3.tar.gz feedparser==5.1.3 BeautifulSoup==3.2.1 beautifulsoup4==4.1.3 diff --git a/scripts/create-instance.sh b/scripts/create-instance.sh index 39257fd04e..d523347710 100755 --- a/scripts/create-instance.sh +++ b/scripts/create-instance.sh @@ -156,7 +156,7 @@ install_sources () { make clean -s make -s sudo -u "${INVENIO_WEB_USER}" make -s install - #sudo -u "${INVENIO_WEB_USER}" make -s install-jquery-plugins + sudo -u "${INVENIO_WEB_USER}" make -s install-jquery-plugins sudo -u "${INVENIO_WEB_USER}" make -s install-mathjax-plugin sudo -u "${INVENIO_WEB_USER}" make -s install-ckeditor-plugin sudo -u "${INVENIO_WEB_USER}" make -s install-pdfa-helper-files