more refactor
This commit is contained in:
		| @@ -14,10 +14,10 @@ PROJECT_INCLUDES_FULL_PATH="$(realpath ./Project-ConfigFiles)" | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| #Framework variables are read from hee | #Framework variables are read from hee | ||||||
| source $VARS_FULL_PATH/FrameworkVars | source $FRAMEWORK_CONFIGS_FULL_PATH/FrameworkVars | ||||||
| 
 | 
 | ||||||
| #Boilerplate and support functions | #Boilerplate and support functions | ||||||
| FrameworkIncludeFiles="$(ls -1 --color=none includes/*)" | FrameworkIncludeFiles="$(ls -1 --color=none $FRAMEWORK_INCLUDES_FULL_PATH/*)" | ||||||
| 
 | 
 | ||||||
| IFS=$'\n\t' | IFS=$'\n\t' | ||||||
| for file in ${FrameworkIncludeFiles[@]}; do | for file in ${FrameworkIncludeFiles[@]}; do | ||||||
| @@ -27,7 +27,7 @@ unset IFS | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| if [[ ProjectIncludes = 1 ]]; then | if [[ ProjectIncludes = 1 ]]; then | ||||||
| ProjectIncludeFiles="$(ls -1 --color=none project-includes/*)" | ProjectIncludeFiles="$(ls -1 --color=none $PROJECT_INCLUDES_FULL_PATH/*)" | ||||||
| IFS=$'\n\t' | IFS=$'\n\t' | ||||||
| for file in ${ProjectIncludeFiles[@]}; do | for file in ${ProjectIncludeFiles[@]}; do | ||||||
| 	. "$file" | 	. "$file" | ||||||
| @@ -35,7 +35,6 @@ done | |||||||
| unset IFS | unset IFS | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| ##### | ##### | ||||||
| #Core framework functions... | #Core framework functions... | ||||||
| ##### | ##### | ||||||
| @@ -66,11 +65,8 @@ done | |||||||
| 
 | 
 | ||||||
| function main() | function main() | ||||||
| { | { | ||||||
| StrictMode |  | ||||||
| 
 | 
 | ||||||
| if [ PreflightCheck = 1 ]; then |  | ||||||
| PreflightCheck | PreflightCheck | ||||||
| fi |  | ||||||
| 
 | 
 | ||||||
| echo > $LOGFILENAME | echo > $LOGFILENAME | ||||||
| 
 | 
 | ||||||
		Reference in New Issue
	
	Block a user