Changeset 30038
- Timestamp:
- 2015-07-17T17:45:54+12:00 (9 years ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/bin/script/IPv4.bat
r30037 r30038 1 1 @echo off 2 3 rem This script will echo the IPv4 of this windows machine. E.g. 100.200.300.45 4 rem If passed -format-for-tomcat-context, it will echo the same with a pipe 5 rem symbol up front and all the . escaped with a "\". E.g. "|100\.200\.300\.45" 6 2 7 for /f "usebackq tokens=2 delims=:" %%a in (`ipconfig ^| find "IPv4"`) do (set result=%%a) 3 8 4 :: To lop off extra space in front of IPv4 number, end with:9 :: To lop off the single extra space in front of IPv4 number, end with: 5 10 ::do (set result=%a& echo %result:~1%) 6 11 :: Alternative: for /f "tokens=2 delims=:" %a in ('ipconfig ^| findstr /C:"IPv4 Address"') do echo %a … … 11 16 12 17 :: The above produces the IPv4 number, e.g. 100.200.300.45 18 19 20 rem Check if we're requested to format the IPv4 for the solr.xml tomcat context file 21 if [%1]==[] goto done 22 if not "%1"=="-format-for-tomcat-context" goto done 23 13 24 :: Still need to replace . with \. 14 25 :: http://scripts.dragon-it.co.uk/scripts.nsf/docs/batch-search-replace-substitute!OpenDocument&ExpandSection=3&BaseTarget=East&AutoFramed … … 25 36 ::set result=^|%result% 26 37 38 echo ^|%result% 39 goto fin 40 41 42 :done 27 43 :: Echo a vertical bar up front, regardless of whether the result is empty 28 echo ^|%result% 44 echo %result% 45 46 :fin -
main/trunk/greenstone3/bin/script/IPv4.sh
r30037 r30038 1 1 #!/bin/bash 2 3 # This script will echo the IPv4 of this unix machine. E.g. 100.200.300.45 4 # If passed -format-for-tomcat-context, it will echo the same with a pipe 5 # symbol up front and all the . escaped with a "\". E.g. "|100\.200\.300\.45" 2 6 3 7 #http://www.wikihow.com/Find-Your-IP-Address-on-a-Mac#Finding_Your_Internal_IP_Using_the_Terminal_sub … … 11 15 #echo `ifconfig | grep "inet " | grep -v 127.0.0.1`|cut -d' ' -f 2|cut -d':' -f 2 12 16 13 14 17 tmp=`ifconfig | grep "inet " | grep -v 127.0.0.1` 15 18 16 19 tmp=`echo $tmp|cut -d' ' -f 2|cut -d':' -f 2` 17 20 18 #http://stackoverflow.com/questions/13210880/replace-one-substring-for-another-string-in-shell-script 19 #${original_string//searchterm/$string_to_replace_searchterm_with} 20 replace="." 21 replacement="\." 21 # if requested to format the IPv4 for the solr.xml tomcat context file 22 if [ "$1" == "-format-for-tomcat-context" ]; then 22 23 23 tmp=${tmp//$replace/$replacement} 24 #http://stackoverflow.com/questions/13210880/replace-one-substring-for-another-string-in-shell-script 25 #${original_string//searchterm/$string_to_replace_searchterm_with} 26 replace="." 27 replacement="\." 28 29 tmp=${tmp//$replace/$replacement} 30 31 # next, if the tmp variable is not the empty string, prefix the | operator 32 # http://unix.stackexchange.com/questions/146942/how-can-i-test-if-a-variable-is-empty-or-contains-only-spaces 33 # Can just return | if $tmp is empty, as that doesn't really matter. Will be consistent with windows 34 if [[ ! -z "${tmp// }" ]]; then 35 tmp="|$tmp" 36 else 37 tmp="|" 38 fi 24 39 25 # next, if the tmp variable is not the empty string, prefix the | operator26 # http://unix.stackexchange.com/questions/146942/how-can-i-test-if-a-variable-is-empty-or-contains-only-spaces27 # Can just return | if $tmp is empty, as that doesn't really matter. Will be consistent with windows28 if [[ ! -z "${tmp// }" ]]; then29 tmp="|$tmp"30 else31 tmp="|"32 40 fi 33 41 42 echo $tmp 34 43 35 echo $tmp -
main/trunk/greenstone3/build.xml
r30037 r30038 1414 1414 1415 1415 </target> 1416 1417 <target name="test-ipv4">1418 <exec executable="${basedir}/bin/script/IPv4.sh" os="${os.unix}" failonerror="false" outputproperty="ipv4.val"/>1419 <exec executable="${basedir}/IPv4.bat" osfamily="windows" failonerror="false" outputproperty="ipv4.val"/>1420 <echo>IPv4 was: ${ipv4.val}</echo>1421 </target>1422 1423 1416 1424 1417 <target name="configure-tomcat" depends="init,configure-tomcat-local,configure-tomcat-external"/> … … 1435 1428 1436 1429 <!-- set up the solr context --> 1437 1438 <exec executable="${basedir}/bin/script/IPv4.sh" os="${os.unix}" failonerror="false" outputproperty="ipv4.val"/> 1439 <exec executable="${basedir}/bin/script/IPv4.bat" osfamily="windows" failonerror="false" outputproperty="ipv4.val"/> 1440 1430 1431 <!-- First work out the IPv4 address for this machine --> 1432 <exec executable="${basedir}/bin/script/IPv4.sh" os="${os.unix}" failonerror="false" outputproperty="ipv4.val"> 1433 <arg value="-format-for-tomcat-context"/> 1434 </exec> 1435 <exec executable="${basedir}/bin/script/IPv4.bat" osfamily="windows" failonerror="false" outputproperty="ipv4.val"> 1436 <arg value="-format-for-tomcat-context"/> 1437 </exec> 1441 1438 1442 1439 <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true">
Note:
See TracChangeset
for help on using the changeset viewer.