Changeset 30038 for main/trunk/greenstone3/bin/script/IPv4.sh

Timestamp:

2015-07-17T17:45:54+12:00 (9 years ago)

Author:

ak19

Message:

Modified IPv4 scripts to take the parameter -format-for-tomcat-context if it needs to format the IPv4 address. If not passed this flag, it will return the IPv4 address unformatted. build.xml is now updated to pass this flag to the scripts.

File:

• main/trunk/greenstone3/bin/script/IPv4.sh (modified) (2 diffs)

main/trunk/greenstone3/bin/script/IPv4.sh

@@ -1 +1 @@
 #!/bin/bash
+
+# This script will echo the IPv4 of this unix machine. E.g. 100.200.300.45
+# If passed -format-for-tomcat-context, it will echo the same with a pipe
+# symbol up front and all the . escaped with a "\". E.g. "|100\.200\.300\.45"
 
 #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
 
-
 tmp=`ifconfig | grep "inet " | grep -v 127.0.0.1`
 
 tmp=`echo $tmp|cut -d' ' -f 2|cut -d':' -f 2`
 
-#http://stackoverflow.com/questions/13210880/replace-one-substring-for-another-string-in-shell-script
-#${original_string//searchterm/$string_to_replace_searchterm_with}
-replace="."
-replacement="\."
+# if requested to format the IPv4 for the solr.xml tomcat context file
+if [ "$1" == "-format-for-tomcat-context" ]; then
 
-tmp=${tmp//$replace/$replacement}
+    #http://stackoverflow.com/questions/13210880/replace-one-substring-for-another-string-in-shell-script
+    #${original_string//searchterm/$string_to_replace_searchterm_with}
+    replace="."
+    replacement="\."
+    
+    tmp=${tmp//$replace/$replacement}
+    
+    # next, if the tmp variable is not the empty string, prefix the | operator
+    # http://unix.stackexchange.com/questions/146942/how-can-i-test-if-a-variable-is-empty-or-contains-only-spaces
+    # Can just return | if $tmp is empty, as that doesn't really matter. Will be consistent with windows
+    if [[ ! -z "${tmp// }" ]]; then
+    tmp="|$tmp"
+    else
+    tmp="|"
+    fi
 
-# next, if the tmp variable is not the empty string, prefix the | operator
-# http://unix.stackexchange.com/questions/146942/how-can-i-test-if-a-variable-is-empty-or-contains-only-spaces
-# Can just return | if $tmp is empty, as that doesn't really matter. Will be consistent with windows
-if [[ ! -z "${tmp// }" ]]; then
-    tmp="|$tmp"
-else
-    tmp="|"
 fi
 
+echo $tmp
 
-echo $tmp