fix --no_cache_galaxy

lecorguille · lecorguille · commit d8f2038135f7 · 2016-04-18T21:56:40.000+02:00
diff --git a/planemo/galaxy/config.py b/planemo/galaxy/config.py
@@ -587,7 +587,9 @@ def _install_galaxy(ctx, config_directory, env, kwds):
 def _install_galaxy_via_download(ctx, config_directory, env, kwds):
     branch = _galaxy_branch(kwds)
     tar_cmd = "tar -zxvf %s" % branch
-    command = DOWNLOAD_GALAXY + "; %s | tail" % tar_cmd
+    command = DOWNLOAD_GALAXY + "%s; %s | tail" % (branch, tar_cmd)
+    if branch != "dev":
+        command = command + "; ln -s galaxy-%s galaxy-dev" % (branch)
     _install_with_command(ctx, config_directory, command, env, kwds)
 
 
diff --git a/planemo/galaxy/run.py b/planemo/galaxy/run.py
@@ -23,7 +23,7 @@
 
 # TODO: Mac-y curl variant of this.
 DOWNLOAD_GALAXY = (
-    "wget https://codeload.github.com/galaxyproject/galaxy/tar.gz/dev"
+    "wget https://codeload.github.com/galaxyproject/galaxy/tar.gz/"
 )
 
 CACHED_VIRTUAL_ENV_COMMAND = ("if [ -d .venv ] || [ -f dist-eggs.ini ];"

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`# TODO: Mac-y curl variant of this.`
`25`	`25`	`DOWNLOAD_GALAXY = (`
`26`		`- "wget https://codeload.github.com/galaxyproject/galaxy/tar.gz/dev"`
	`26`	`+ "wget https://codeload.github.com/galaxyproject/galaxy/tar.gz/"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`CACHED_VIRTUAL_ENV_COMMAND = ("if [ -d .venv ] \|\| [ -f dist-eggs.ini ];"`