diff options
| -rwxr-xr-x | bootstrap.sh | 3 | ||||
| -rw-r--r-- | docs/source/siteadmin/media-types.rst | 3 | ||||
| -rw-r--r-- | extlib/README | 3 | ||||
| -rw-r--r-- | guix-env.scm | 5 |
4 files changed, 5 insertions, 9 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 48e08a25..6349f4bb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -5,5 +5,4 @@ set -e aclocal -I m4 --install autoreconf -fvi -git submodule init -git submodule update +git submodule update --init diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 50edcce7..ea2afb47 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -265,8 +265,7 @@ support. This will result in a much smaller list of dependencies. pdf.js relies on git submodules, so be sure you have fetched them:: - $ git submodule init - $ git submodule update + $ git submodule update --init This feature has been tested on Fedora with: poppler-utils-0.20.2-9.fc18.x86_64 diff --git a/extlib/README b/extlib/README index d2ef18d3..88f0bbf3 100644 --- a/extlib/README +++ b/extlib/README @@ -114,8 +114,7 @@ FAQ Use it just like a snapshotted extlib directory. When a new clone of mediagoblin is made you need to run - git submodule init - git submodule update + git submodule update --init As noted in HackingHowto diff --git a/guix-env.scm b/guix-env.scm index 856552cd..2ee22ce3 100644 --- a/guix-env.scm +++ b/guix-env.scm @@ -41,12 +41,11 @@ ;;; use guix -l guix-env.scm ;;; ;;; To set things up for the first time, you'll also need to run: -;;; git submodule init -;;; git submodule update +;;; git submodule update --init ;;; ./bootstrap.sh ;;; ./configure --without-virtualenv ;;; make -;;; python3 -m venv --system-site-packages . && bin/python setup.py develop --no-deps +;;; python3 -m venv --system-site-packages . && bin/python setup.py develop --no-deps ;;; bin/python -m pip install --force-reinstall PasteScript # workaround ;;; bin/python -m pip install 'werkzeug<1.0.0' # workaround (also disabled below) ;;; bin/python -m pip install 'email-validator' # email-validator |