diff --git a/install.sh b/install.sh index 7b61206..d02c524 100755 --- a/install.sh +++ b/install.sh @@ -6,6 +6,8 @@ # version : 1.0.0 # #-------------------# +username=${LOGNAME} + # Color variables txtgrn=$(tput setaf 2) # Green txtylw=$(tput setaf 3) # Yellow @@ -141,7 +143,7 @@ echo -e "SRILM toolkit : \t ${txtgrn}OK${txtrst}" echo -e "\n\t${txtblu}Speeral configuration${txtrst}\n" echo -e "Download Speeral bin and data :" -scp -r rey@nyx:~/OTMEDIA_DATA/Speeral $OTMEDIA_HOME/tools/ +scp -r @nyx:~/OTMEDIA_DATA/Speeral $OTMEDIA_HOME/tools/ echo -e "\n\t${txtblu}Generating Speeral configuration files :${txtrst}\n" cat $PWD/tools/Speeral/CFG/SpeeralFirstPass.xml.tmp | sed -e "s|[^<]*|$PWD/tools/Speeral/LEX/LEXIQUE_V6.speer|g" \ | sed -e "s|[^<]*|$PWD/tools/Speeral/LM/ML_4gOTMEDIA_LEXIQUE_V6|g" \ @@ -201,7 +203,7 @@ then echo -e "Download SOLR DB\r" mkdir -p $OTMEDIA_HOME/tools/SOLR 2> /dev/null - scp -r rey@nyx:~/OTMEDIA_DATA/SOLR/otmedia-2013-04.tar.gz $OTMEDIA_HOME/tools/SOLR + scp -r @nyx:~/OTMEDIA_DATA/SOLR/otmedia-2013-04.tar.gz $OTMEDIA_HOME/tools/SOLR echo -e "Unzip SOLR DB\r" res=0 #res = $(tar -xvzf "$OTMEDIA_HOME/tools/SOLR/otmedia-2013-04.tar.gz" "$OTMEDIA_HOME/tools/SOLR/") @@ -252,7 +254,7 @@ echo -e "\n\t${txtgrn}### Install completed ###${txtrst}\n" echo -e "do : source ~/.bashrc" echo -e "or set variable :\n" echo "export OTMEDIA_HOME=$PWD" -echo "export PATH=$PATH:$OTMEDIA_HOME/main_tools" +echo "export PATH=\$PATH:$OTMEDIA_HOME/main_tools" echo "export SRILM_BIN=$SRILM/bin/$MACHINE_TYPE" @@ -261,4 +263,4 @@ echo " ,-~~~-\\\\_" echo " ( .\ " echo " @\___(__--'" -echo "${txtgrn}Yes${txtylw}I${txtpur}Rastafari{$txtrst}" +echo "${txtgrn}Yes${txtylw}I${txtcyn}Rastafari${txtrst}"