1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 21 Jan 2019 09:01:19 +0100
Description: There is no point in delivering read_file_names in /usr/bin
It is available in /usr/share/discosnp/bin/read_file_names - this patch adapts
the scripts using it.
.
Some other issues of these scripts are fixed as well.
--- a/run_discoSnp++.sh
+++ b/run_discoSnp++.sh
@@ -65,7 +65,8 @@ verbose=1
stop_after_kissnp=0
e=""
#EDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-EDIR=$( python -c "import os.path; print(os.path.dirname(os.path.realpath(\"${BASH_SOURCE[0]}\")))" ) # as suggested by Philippe Bordron
+#EDIR=$( python -c "import os.path; print(os.path.dirname(os.path.realpath(\"${BASH_SOURCE[0]}\")))" ) # as suggested by Philippe Bordron
+EDIR="/usr"
if [ -d "$EDIR/build/" ] ; then # VERSION SOURCE COMPILED
@@ -74,13 +75,13 @@ if [ -d "$EDIR/build/" ] ; then # VERSIO
kissnp2_bin=$EDIR/build/bin/kissnp2
kissreads2_bin=$EDIR/build/bin/kissreads2
else # VERSION BINARY
- read_file_names_bin=$EDIR/bin/read_file_names
+ read_file_names_bin=/usr/lib/discosnp/bin/read_file_names
dbgh5_bin=$EDIR/bin/dbgh5
kissnp2_bin=$EDIR/bin/kissnp2
kissreads2_bin=$EDIR/bin/kissreads2
fi
-chmod +x $EDIR/scripts/*.sh $EDIR/run_discoSnpRad.sh 2>/dev/null # Usefull for binary distributions
+#chmod +x $EDIR/scripts/*.sh $EDIR/run_discoSnpRad.sh 2>/dev/null # Usefull for binary distributions
useref=""
wraith="false"
@@ -667,7 +668,7 @@ echo -e " #################### CREATE VC
echo -e " ############################################################### $reset"
if [ -z "$genome" ]; then # NO reference genome use, vcf creator mode 1
- vcfCreatorCmd="$EDIR/scripts/run_VCF_creator.sh -p ${kissprefix}_coherent.fa -o ${kissprefix}_coherent.vcf"
+ vcfCreatorCmd="/usr/share/discosnp/scripts/run_VCF_creator.sh -p ${kissprefix}_coherent.fa -o ${kissprefix}_coherent.vcf"
echo $green$vcfCreatorCmd$cyan
if [[ "$wraith" == "false" ]]; then
$vcfCreatorCmd
@@ -678,7 +679,7 @@ if [ -z "$genome" ]; then # NO referenc
exit 1
fi
else # A Reference genome is provided, vcf creator mode 2
- vcfCreatorCmd="$EDIR/scripts/run_VCF_creator.sh $bwa_path_option -G $genome $bwa_path_option -p ${kissprefix}_coherent.fa -o ${kissprefix}_coherent.vcf -I $option_cores_post_analysis $e"
+ vcfCreatorCmd="/usr/share/discosnp/scripts/run_VCF_creator.sh $bwa_path_option -G $genome $bwa_path_option -p ${kissprefix}_coherent.fa -o ${kissprefix}_coherent.vcf -I $option_cores_post_analysis $e"
echo $green$vcfCreatorCmd$cyan
if [[ "$wraith" == "false" ]]; then
$vcfCreatorCmd
@@ -711,4 +712,4 @@ if [[ "$wraith" == "false" ]]; then
fi
echo -e " Thanks for using discoSnp++ - http://colibread.inria.fr/discoSnp/ - Forum: http://www.biostars.org/t/discoSnp/"
echo -e "################################################################################################################$reset"
-fi
\ No newline at end of file
+fi
|