# HG changeset patch
# User bgruening
# Date 1486082281 18000
# Node ID c1d822f84e1a05480ee1de8d846a2afc5479feb2
# Parent  91f3a2147127143e5509b48aec50b0af0421d2b1
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/salmon commit f437f5e8c6c856c6f0bb8d8ea6e34f5441ee088f

diff -r 91f3a2147127 -r c1d822f84e1a README.rst
--- a/README.rst	Tue Nov 15 11:36:41 2016 -0500
+++ b/README.rst	Thu Feb 02 19:38:01 2017 -0500
@@ -10,7 +10,8 @@
 Automated Installation
 ======================
 
-Galaxy should be able to automatically install the salmon for you.
+Galaxy should be able to automatically install the salmon for you if you have Conda dependency management enabled in Galaxy.
+For more information please read the documentation at: https://github.com/galaxyproject/galaxy/blob/dev/doc/source/admin/conda_faq.rst
 
 
 History
diff -r 91f3a2147127 -r c1d822f84e1a salmon.xml
--- a/salmon.xml	Tue Nov 15 11:36:41 2016 -0500
+++ b/salmon.xml	Thu Feb 02 19:38:01 2017 -0500
@@ -28,8 +28,8 @@
         mkdir ./index
         &&
         mkdir ./output
-        &&
         #if $refTranscriptSource.TranscriptSource == "history":
+            &&
             salmon index
                 --transcripts $refTranscriptSource.ownFile
                 --kmerLen $refTranscriptSource.kmerLen