update install script

Jean-François Rey
1 parent 7c52739538
Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff
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 "\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|<nom>[^<]*</nom>|<nom>$PWD/tools/Speeral/LEX/LEXIQUE_V6.speer</nom>|g" \
     | sed -e "s|<ngramme>[^<]*</ngramme>|<ngramme>$PWD/tools/Speeral/LM/ML_4gOTMEDIA_LEXIQUE_V6</ngramme>|g" \
@@ -201,7 +203,7 @@
  
         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 "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,5 +263,5 @@
 echo "       (        .\ "
 echo "       @\___(__--'"
  
-echo "${txtgrn}Yes${txtylw}I${txtpur}Rastafari{$txtrst}"
+echo "${txtgrn}Yes${txtylw}I${txtcyn}Rastafari${txtrst}"
...	...	@@ -6,6 +6,8 @@
6	6	# version : 1.0.0 #
7	7	#-------------------#
8	8
	9	+username=${LOGNAME}
	10	+
9	11	# Color variables
10	12	txtgrn=$(tput setaf 2) # Green
11	13	txtylw=$(tput setaf 3) # Yellow
...	...	@@ -141,7 +143,7 @@
141	143
142	144	echo -e "\n\t${txtblu}Speeral configuration${txtrst}\n"
143	145	echo -e "Download Speeral bin and data :"
144		-scp -r rey@nyx:~/OTMEDIA_DATA/Speeral $OTMEDIA_HOME/tools/
	146	+scp -r @nyx:~/OTMEDIA_DATA/Speeral $OTMEDIA_HOME/tools/
145	147	echo -e "\n\t${txtblu}Generating Speeral configuration files :${txtrst}\n"
146	148	cat $PWD/tools/Speeral/CFG/SpeeralFirstPass.xml.tmp \| sed -e "s\|<nom>[^<]*</nom>\|<nom>$PWD/tools/Speeral/LEX/LEXIQUE_V6.speer</nom>\|g" \
147	149	\| sed -e "s\|<ngramme>[^<]*</ngramme>\|<ngramme>$PWD/tools/Speeral/LM/ML_4gOTMEDIA_LEXIQUE_V6</ngramme>\|g" \
...	...	@@ -201,7 +203,7 @@
201	203
202	204	echo -e "Download SOLR DB\r"
203	205	mkdir -p $OTMEDIA_HOME/tools/SOLR 2> /dev/null
204		- scp -r rey@nyx:~/OTMEDIA_DATA/SOLR/otmedia-2013-04.tar.gz $OTMEDIA_HOME/tools/SOLR
	206	+ scp -r @nyx:~/OTMEDIA_DATA/SOLR/otmedia-2013-04.tar.gz $OTMEDIA_HOME/tools/SOLR
205	207	echo -e "Unzip SOLR DB\r"
206	208	res=0
207	209	#res = $(tar -xvzf "$OTMEDIA_HOME/tools/SOLR/otmedia-2013-04.tar.gz" "$OTMEDIA_HOME/tools/SOLR/")
...	...	@@ -252,7 +254,7 @@
252	254	echo -e "do : source ~/.bashrc"
253	255	echo -e "or set variable :\n"
254	256	echo "export OTMEDIA_HOME=$PWD"
255		-echo "export PATH=$PATH:$OTMEDIA_HOME/main_tools"
	257	+echo "export PATH=\$PATH:$OTMEDIA_HOME/main_tools"
256	258	echo "export SRILM_BIN=$SRILM/bin/$MACHINE_TYPE"
257	259
258	260
...	...	@@ -261,5 +263,5 @@
261	263	echo " ( .\ "
262	264	echo " @\___(__--'"
263	265
264		-echo "${txtgrn}Yes${txtylw}I${txtpur}Rastafari{$txtrst}"
	266	+echo "${txtgrn}Yes${txtylw}I${txtcyn}Rastafari${txtrst}"