update

Jean-François Rey
1 parent b3f8a55c6f
Showing 1 changed file with 7 additions and 6 deletions Side-by-side Diff
install.sh
@@ -194,8 +194,9 @@
     fi
     echo -e "\nTOMCAT : \t ${txtgrn}OK${txtrst}\n"
     # SOLR secondly
-    echo -e "\t${txtblu}Install SOLR DB${txtrst}"
-    read -e -p "You will need 300 Go of free space to install SOLR DB\nContinue ? (y/n) " solr
+    echo -e "\t${txtblu}Install SOLR DB${txtrst}\n"
+    read -e "You will need 300 Go of free space to install SOLR DB"
+    read -p "Continue ? (y/n) " solr
     if [ "$solr" == "y" ]
     then
  
  
  
@@ -215,16 +216,16 @@
     then
         read -p "Enter SOLR server IP :" ip
         if [ "${ip}" == "" ];then ip="127.0.0.1";fi
-        echo 'machine = "${ip}"' > $OTMEDIA_HOME/tools/scripts/solrinfo.py
+        echo "machine = \"${ip}\"" > $OTMEDIA_HOME/tools/scripts/solrinfo.py
         read -p "Enter SOLR server port :" port
         if [ "${port}" == "" ]; then port="8080";fi
         echo -e "\n\tSOLR server IP ${ip}"
         echo -e "\tSOLR server port ${port}"
-        echo 'port = "${port}"' >> $OTMEDIA_HOME/tools/scripts/solrinfo.py
+        echo "port = \"${port}\"" >> $OTMEDIA_HOME/tools/scripts/solrinfo.py
     else
         echo "Skipping SOLR DB Configuration"
     fi
-    echo -e "See SOLR.INSTALL file for more information\n"
+    echo -e "\nSee SOLR.INSTALL file for more information\n"
 fi
  
 ### Set Variables in bashrc ###
@@ -247,7 +248,7 @@
 echo "CHECK=0" >> $OTMEDIA_HOME/cfg/main_cfg.cfg
 echo "RERUN=0" >> $OTMEDIA_HOME/cfg/main_cfg.cfg
  
-echo -e "\n\n\t${txtgrn}### Install completed ###${txtrst}\n"
+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"
...	...	@@ -194,8 +194,9 @@
194	194	fi
195	195	echo -e "\nTOMCAT : \t ${txtgrn}OK${txtrst}\n"
196	196	# SOLR secondly
197		- echo -e "\t${txtblu}Install SOLR DB${txtrst}"
198		- read -e -p "You will need 300 Go of free space to install SOLR DB\nContinue ? (y/n) " solr
	197	+ echo -e "\t${txtblu}Install SOLR DB${txtrst}\n"
	198	+ read -e "You will need 300 Go of free space to install SOLR DB"
	199	+ read -p "Continue ? (y/n) " solr
199	200	if [ "$solr" == "y" ]
200	201	then
201	202
202	203
203	204
...	...	@@ -215,16 +216,16 @@
215	216	then
216	217	read -p "Enter SOLR server IP :" ip
217	218	if [ "${ip}" == "" ];then ip="127.0.0.1";fi
218		- echo 'machine = "${ip}"' > $OTMEDIA_HOME/tools/scripts/solrinfo.py
	219	+ echo "machine = \"${ip}\"" > $OTMEDIA_HOME/tools/scripts/solrinfo.py
219	220	read -p "Enter SOLR server port :" port
220	221	if [ "${port}" == "" ]; then port="8080";fi
221	222	echo -e "\n\tSOLR server IP ${ip}"
222	223	echo -e "\tSOLR server port ${port}"
223		- echo 'port = "${port}"' >> $OTMEDIA_HOME/tools/scripts/solrinfo.py
	224	+ echo "port = \"${port}\"" >> $OTMEDIA_HOME/tools/scripts/solrinfo.py
224	225	else
225	226	echo "Skipping SOLR DB Configuration"
226	227	fi
227		- echo -e "See SOLR.INSTALL file for more information\n"
	228	+ echo -e "\nSee SOLR.INSTALL file for more information\n"
228	229	fi
229	230
230	231	### Set Variables in bashrc ###
...	...	@@ -247,7 +248,7 @@
247	248	echo "CHECK=0" >> $OTMEDIA_HOME/cfg/main_cfg.cfg
248	249	echo "RERUN=0" >> $OTMEDIA_HOME/cfg/main_cfg.cfg
249	250
250		-echo -e "\n\n\t${txtgrn}### Install completed ###${txtrst}\n"
	251	+echo -e "\n\t${txtgrn}### Install completed ###${txtrst}\n"
251	252	echo -e "do : source ~/.bashrc"
252	253	echo -e "or set variable :\n"
253	254	echo "export OTMEDIA_HOME=$PWD"