Revert firedrake-install location, to avoid breaking firedrake-update

.github/workflows/build.yml

@@ -59,7 +59,7 @@ jobs:
           cd ..
           # Linting should ignore unquoted shell variable $COMPLEX
           # shellcheck disable=SC2086
-          ./firedrake/firedrake/scripts/firedrake-install \
+          ./firedrake/scripts/firedrake-install \
             $COMPLEX \
             --honour-petsc-dir \
             --mpicc="$MPICH_DIR"/mpicc \

.github/workflows/zenodo-canary.yml

@@ -25,7 +25,7 @@ jobs:
           pip install requests packaging
       - name: Zenodo API canary
         run: |
-          python firedrake/scripts/firedrake-install --test-doi-resolution
+          python scripts/firedrake-install --test-doi-resolution
       - name: Upload log
         uses: actions/upload-artifact@v4
         if: failure()

Makefile

@@ -17,6 +17,7 @@ lint:
 	@python -m flake8 $(FLAKE8_FORMAT) firedrake
 	@echo "    Linting firedrake scripts"
 	@python -m flake8 $(FLAKE8_FORMAT) firedrake/scripts --filename=*
+	@python -m flake8 $(FLAKE8_FORMAT) scripts --filename=*
 	@echo "    Linting firedrake tests"
 	@python -m flake8 $(FLAKE8_FORMAT) tests
 	@echo "    Linting PyOP2"

docs/source/download.rst

@@ -8,7 +8,7 @@ Obtaining Firedrake
 
 Firedrake is installed using its install script::
 
-  curl -O https://raw.githubusercontent.com/firedrakeproject/firedrake/master/firedrake/scripts/firedrake-install
+  curl -O https://raw.githubusercontent.com/firedrakeproject/firedrake/master/scripts/firedrake-install
 
 In the simplest cases, such as on a Mac with Homebrew installed or on
 an Ubuntu workstation on which the user has sudo acccess, the user can simply run::
@@ -232,7 +232,7 @@ You should now be able to run ``firedrake-update``.
 Installing Firedrake with pip (experimental, Linux only)
 --------------------------------------------------------
 
-Firedrake is working towards having support for binary installs. As such there is experimental support for installing Firedrake using ``pip``, avoiding the need for a ``firedrake-install`` script. At present only Linux is tested using this install method.
+Firedrake has experimental support for installing using ``pip``, avoiding the need for the ``firedrake-install`` script. At present only Linux is tested using this install method.
 
 Requirements
 ~~~~~~~~~~~~

firedrake/scripts/firedrake-install → scripts/firedrake-install

@@ -1397,7 +1397,7 @@ def quit(message):
 
 def build_update_script():
     log.info("Creating firedrake-update script.")
-    with open("firedrake/firedrake/scripts/firedrake-install", "r") as f:
+    with open("firedrake/scripts/firedrake-install", "r") as f:
         update_script = f.read()
 
     try:
@@ -1410,7 +1410,7 @@ def build_update_script():
 
 
 if args.rebuild_script:
-    os.chdir(os.path.dirname(os.path.realpath(__file__)) + ("/../../.."))
+    os.chdir(os.path.dirname(os.path.realpath(__file__)) + ("/../.."))
 
     build_update_script()