Removed 'sudo's from require build process

configure/CONFIG

@@ -24,7 +24,6 @@ include $(TOP)/configure/E3/CONFIG_REQUIRE
 include $(TOP)/configure/E3/CONFIG_E3_PATH
 include $(TOP)/configure/E3/CONFIG_E3_MAKEFILE
 include $(TOP)/configure/E3/CONFIG_EPICS
-include $(TOP)/configure/E3/CONFIG_SUDO
 include $(TOP)/configure/E3/CONFIG_EXPORT
 
 

configure/E3/CONFIG_EXPORT

@@ -22,7 +22,6 @@ EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
 EXPORT_VARS+=QUIET
 EXPORT_VARS+=$(filter %_DEP_VERSION,$(.VARIABLES))
 EXPORT_VARS+=$(filter WITH_%,$(.VARIABLES))
-EXPORT_VARS+=$(filter SUDO%,$(.VARIABLES))
 
 export_version=$(eval export $1)
 $(eval $(foreach v,$(EXPORT_VARS),$(call export_version,$v)))

configure/E3/CONFIG_SUDO

-# IF EPICS_BASE is not WRITABLE, SUDO and SUDOBASH should be used 
-# SUDO_INFO 1 : SUDO is needed (NOT writable)
-# SUDO_INFO 0 : SUDO is not needed
-SUDO_INFO := $(shell test -w $(EPICS_BASE) 1>&2 2> /dev/null; echo $$?)
-SUDO_CMD := $(shell which sudo)
-
-# For CentOS, devtoolset-{7,8} has -E option within sudo shell
-# So we have to remove -E option as well if we would like to use devtoolset
-#
-ifeq "$(SUDO_INFO)" "1"
- ifneq (,$(findstring devtoolset,$(SUDO_CMD)))
-  SUDO = $(SUDO_CMD)
- else
-  SUDO = $(SUDO_CMD) -E
- endif
-else
- SUDO :=
-endif
-SUDOBASH = $(SUDO) bash -c
-
-
-VARS_EXCLUDES+=SUDO
-VARS_EXCLUDES+=SUDOBASH
-VARS_EXCLUDES+=SUDO_INFO
-VARS_EXCLUDES+=SUDO_CMD
-VARS_EXCLUDES+=E3_MODULE_SRC_PATH_INFO

configure/E3/RULES_E3

@@ -32,13 +32,13 @@ help:
 install: requireconf install_module
 
 install_module: build db
-	$(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) install'
+	$(QUIET) $(E3_MODULE_MAKE_CMDS) install
 
 ## Uninstall the current module
 uninstall: conf
 #ifeq (,$(strip $(wildcard $(E3_SITEMODS_PATH)/*) $(wildcard $(E3_SITEAPPS_PATH)/*) $(wildcard $(E3_SITELIBS_PATH)/*)))
 ifeq (,$(strip $(wildcard $(E3_SITEMODS_PATH)/*)))
-	$(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall'
+	$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
 else
 	$(error Cannot run 'make uninstall': please manually uninstall everything in $(E3_SITEMODS_PATH))
 endif
@@ -46,7 +46,7 @@ endif
 # We should be able to force an uninstall of require if we need to; this should not be done without some care and thought, however!
 ## Uninstall, including deleting siteMods directory.
 forceuninstall: conf
-	$(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall'
+	$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
 
 ## Build current module.
 build: conf checkout 

configure/E3/RULES_EPICS

@@ -8,8 +8,8 @@
 # epics:
 #        $(QUIET)echo "EPICS_BASE=$(EPICS_BASE)"       > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
 #        $(QUIET)echo "INSTALL_LOCATION=$(M_IOCSTATS)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE   
-#        $(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
+#        $(MAKE) -C $(E3_MODULE_SRC_PATH)
 
 #epics-clean:
-#        $(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH) clean"
+#        $(MAKE) -C $(E3_MODULE_SRC_PATH) clean
 

configure/E3/RULES_REQUIRE

@@ -25,23 +25,23 @@ E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configur
 .PHONY: e3-site-conf  e3-site-path requireconf
 
 requireconf: e3-site-path e3-site-conf e3-require-path
-	$(QUIET) $(SUDO) install    -m 755 $(wildcard $(E3_MODULE_SRC_PATH)/App/tools/*.tcl)  $(E3_REQUIRE_TOOLS)/
-	$(QUIET) $(SUDO) install    -m 644 $(E3_MODULE_SRC_PATH)/App/tools/driver.makefile    $(E3_REQUIRE_TOOLS)/
-	$(QUIET) $(SUDO) install    -m 755 $(E3_SHELL_FILES)             $(E3_REQUIRE_BIN)/
-	$(QUIET) $(SUDO) install    -m 644 $(E3_IOC_CFG_FILES)           $(E3_REQUIRE_BIN)/
-	$(QUIET) $(SUDO) install    -m 644 $(E3_REQUIRE_CONF_FILES)      $(E3_REQUIRE_CONFIG)/
+	$(QUIET) install    -m 755 $(wildcard $(E3_MODULE_SRC_PATH)/App/tools/*.tcl)  $(E3_REQUIRE_TOOLS)/
+	$(QUIET) install    -m 644 $(E3_MODULE_SRC_PATH)/App/tools/driver.makefile    $(E3_REQUIRE_TOOLS)/
+	$(QUIET) install    -m 755 $(E3_SHELL_FILES)             $(E3_REQUIRE_BIN)/
+	$(QUIET) install    -m 644 $(E3_IOC_CFG_FILES)           $(E3_REQUIRE_BIN)/
+	$(QUIET) install    -m 644 $(E3_REQUIRE_CONF_FILES)      $(E3_REQUIRE_CONFIG)/
 
 
 e3-require-path:
-	$(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_TOOLS)
-	$(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_BIN)
-	$(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_CONFIG)	
+	$(QUIET) install -d -m 755 $(E3_REQUIRE_TOOLS)
+	$(QUIET) install -d -m 755 $(E3_REQUIRE_BIN)
+	$(QUIET) install -d -m 755 $(E3_REQUIRE_CONFIG)	
 
 
 e3-site-path:
-	$(QUIET) $(SUDO) install -d -m 755 $(E3_SITELIBS_PATH)
-	$(QUIET) $(SUDO) install -d -m 755 $(E3_SITEMODS_PATH)
-	$(QUIET) $(SUDO) install -d -m 755 $(E3_SITEAPPS_PATH)
+	$(QUIET) install -d -m 755 $(E3_SITELIBS_PATH)
+	$(QUIET) install -d -m 755 $(E3_SITEMODS_PATH)
+	$(QUIET) install -d -m 755 $(E3_SITEAPPS_PATH)
 
 
 e3-site-conf: