search/replace, revert non-functions

bshp · Feb 14, 2024 · 703928b · 703928b
1 parent 196b919
commit 703928b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/usr/lib/ocie/include/config/apache b/src/usr/lib/ocie/include/config/apache
@@ -93,7 +93,7 @@ fi;
 # Test config and print results
 # Tomcat sources this script, only print if apache
 if [[ ! "${APP_TYPE}" == "tomcat" ]];then
-    local httpd_cfg=$(ociectl --test);
+    httpd_cfg=$(ociectl --test);
     if [[ ! -z "${httpd_cfg}" ]];then
         echo "Ocie: Config: Test FAILED, reverting changes";
         echo "Ocie: Config: Result: ${httpd_cfg}";

diff --git a/src/usr/lib/ocie/include/config/tomcat b/src/usr/lib/ocie/include/config/tomcat
@@ -3,7 +3,7 @@
 . ${OCIE_LIB}/include/config/apache;
 
 # Tomcat specific
-local app_proxies="$(echo ${VADC_IP_ADDRESS// /|} | sed 's/\./\\./g' | sed 's|\/|\\/|g')";
+app_proxies="$(echo ${VADC_IP_ADDRESS// /|} | sed 's/\./\\./g' | sed 's|\/|\\/|g')";
 if [[ -f "${OCIE_HOME}/conf/ocie-tomcat.init" ]];then
     reset_config;
 fi;
@@ -38,7 +38,7 @@ tomcat_set_env;
 apache_mod_jk;
 
 # Ensure config is valid
-local catalina_cfg=$(ociectl --test);
+catalina_cfg=$(ociectl --test);
 if [[ ! -z "${catalina_cfg}" ]];then
     echo "Ocie Config: Tomcat config test FAILED, reverting changes";
     echo "Ocie Config: Result: ${catalina_cfg}";

diff --git a/src/usr/sbin/ocie b/src/usr/sbin/ocie
@@ -72,8 +72,8 @@ function format_args()
     echo "${result}";
 }
 
-local entries=();
-local silent=0;
+entries=();
+silent=0;
 
 for i in "$@";do
     shift
@@ -102,11 +102,11 @@ done;
 
 . ${OCIE_LIB}/include/utils;
 
-local cmds=$(<<< ${!entries[@]} tr ' ' '\n' | sort);
+cmds=$(<<< ${!entries[@]} tr ' ' '\n' | sort);
 for key in $cmds;do
-    local entry="$(echo ${entries[$key]})";
-    local cmd="$(echo ${entry%% *})";
-    local params="$(echo ${entry#* })";
+    entry="$(echo ${entries[$key]})";
+    cmd="$(echo ${entry%% *})";
+    params="$(echo ${entry#* })";
     if [[ -f "${OCIE_LIB}/${cmd}" ]];then
         #print_msg "Ocie: Executing [ ${cmd} ], with arguments: [ ${params} ]";
         #. ${OCIE_LIB}/${cmd} ${params} | print_msg