Merge branch 'rf/deploy' into 'master'

CI: Actually deploy installer script (what caused the infinite self update

See merge request fsl/conda/installer!11

.ci/new_release.sh

@@ -18,6 +18,8 @@ if [ "$scriptver" != "$CI_COMMIT_TAG" ]; then
   exit 1
 fi
 
+cp fslinstaller.py $FSLINSTALLER_DEPLOY_DIRECTORY/
+
 # Then we call the update_manifest.py script, which opens a merge request
 # on the fsl/conda/manifest repository, to update the latest available
 # installer version in the manifest.

fslinstaller.py

@@ -52,7 +52,7 @@ log = logging.getLogger(__name__)
 __absfile__ = op.abspath(__file__).rstrip('c')
 
 
-__version__ = '1.0.13'
+__version__ = '1.0.14'
 """Installer script version number. This is automatically updated
 whenever a new version of the installer script is released.
 """
@@ -1439,7 +1439,11 @@ def self_update(manifest, workdir, checksum):
                      'checksum! Skipping update.', WARNING)
             return
 
-    cmd = [sys.executable, tmpf] + sys.argv[1:]
+    # Don't try and update again - if for some
+    # reason the online manifest reports a newer
+    # version than what is available, we would
+    # otherwise enter into an infinite loop.
+    cmd = [sys.executable, tmpf] + sys.argv[1:] + ['--no_self_update']
     log.debug('Running new installer: %s', cmd)
     os.execv(sys.executable, cmd)