From f5a0aae04caa7bb0b9ea71c0be4179417c1e5e96 Mon Sep 17 00:00:00 2001 From: martinahansen Date: Thu, 25 Oct 2012 12:01:50 +0000 Subject: [PATCH] updated installer git-svn-id: http://biopieces.googlecode.com/svn/trunk@1974 74ccb610-7750-0410-82ae-013aeee3265d --- ...er-0.46.sh => biopieces_installer-0.47.sh} | 36 ++++--------------- 1 file changed, 7 insertions(+), 29 deletions(-) rename bp_scripts/{biopieces_installer-0.46.sh => biopieces_installer-0.47.sh} (94%) diff --git a/bp_scripts/biopieces_installer-0.46.sh b/bp_scripts/biopieces_installer-0.47.sh similarity index 94% rename from bp_scripts/biopieces_installer-0.46.sh rename to bp_scripts/biopieces_installer-0.47.sh index 602a006..1c3343e 100755 --- a/bp_scripts/biopieces_installer-0.46.sh +++ b/bp_scripts/biopieces_installer-0.47.sh @@ -1,7 +1,7 @@ #!/bin/bash # Install script for Biopieces. -# October 2011, Martin A. Hansen +# Copyright (C) October 2011, Martin A. Hansen bp_code="$HOME/biopieces" bp_data="$HOME/BP_DATA" @@ -46,11 +46,13 @@ function exit_success echo "" echo_green "Congratulations - you have now installed Biopieces." echo "" - echo " To list all available Biopieces try 'list_biopieces'" + echo " Now you must either run 'source ~/.bashrc' or re-login to your system." echo "" - echo " To see the synopsis of a Biopiece try 'read_fastq'" + echo " To list all available Biopieces try 'list_biopieces'." echo "" - echo " To see the full description and exampels try 'read_fastq -?'" + echo " To see the synopsis of a Biopiece try 'read_fastq'." + echo "" + echo " To see the full description and exampels try 'read_fastq -?'." echo "" echo " Don't forget to join the Biopieces Google Group for important" echo " messages, questions, discussion, and suggestions:" @@ -126,7 +128,6 @@ function prompt_install echo " * Create installation directories." echo " * Download code from repository." echo " * Set environment in .bashrc." - echo " * Run tests" echo "" echo " Problems? Check out the FAQ:" echo "" @@ -379,7 +380,7 @@ source \"\$BP_DIR/bp_conf/bashrc\" echo_green "OK" fi - echo -n "Sourcing $HOME/.bashrc: " + echo -n "Testing $HOME/.bashrc: " if ! source "$HOME/.bashrc"; then echo_red "FAIL" @@ -550,28 +551,6 @@ function checkout_wiki fi } -# Function to run the Biopieces tests. -function prompt_test_biopieces -{ - echo "Running the Biopieces test suite:" - echo "" - - "$BP_DIR/bp_test/test_all" - - echo "" - echo " Any FAIL indicates broken Biopieces. This is probably because of" - echo " missing prerequisites (see WARNINGs). You can verify this later by" - echo " inspecting the documentation for those Biopieces. Otherwise - seek help!" - - while true; do - read -p "Continue (yes/no)? " answer - case $answer in - [Yy]* ) break;; - [Nn]* ) exit_abort;; - esac - done -} - prompt_install prompt_install_existing prompt_test_prerequisites @@ -584,7 +563,6 @@ checkout_code checkout_wiki prompt_append_bashrc -prompt_test_biopieces exit_success -- 2.39.2