Ensure configuration consistency run in the very beginning and do not process empty apps and plugins.
This commit is contained in:
		| @@ -1,4 +1,13 @@ | |||||||
| # Configuration file loader. | # Configuration file loader. | ||||||
|  | log 1 "Checking for configuration consistency..." | ||||||
|  | for file in `find ${CONFIG_PATH}/zsh/defaults/ -maxdepth 1 -type f -exec basename {} \; | sort`; do | ||||||
|  |     if [ ! -f "${HOME}/.zsh-config.d/${file}" ]; then | ||||||
|  |         cp "${CONFIG_PATH}/zsh/defaults/${file}" "${HOME}/.zsh-config.d/${file}" | ||||||
|  |         log 0 "New configuration file '${file}' copied to your home directory (${HOME}/.zsh-config.d/)." | ||||||
|  |         log 0 "Don't forget to take a look and configure, if neccessary!" | ||||||
|  |     fi | ||||||
|  | done | ||||||
|  |  | ||||||
| if [ ! -d ${HOME}/.zsh-config.d/ ]; then | if [ ! -d ${HOME}/.zsh-config.d/ ]; then | ||||||
|     log 1 "Copying configuration to user's home directory..." |     log 1 "Copying configuration to user's home directory..." | ||||||
|     cp -R "${CONFIG_PATH}/zsh/defaults/" ${HOME}/.zsh-config.d |     cp -R "${CONFIG_PATH}/zsh/defaults/" ${HOME}/.zsh-config.d | ||||||
| @@ -9,12 +18,3 @@ for file in `find ${HOME}/.zsh-config.d/ -maxdepth 1 -type f -exec basename {} \ | |||||||
|     log 1 "Loading configuration file: ${file}" |     log 1 "Loading configuration file: ${file}" | ||||||
|     source "${HOME}/.zsh-config.d/${file}" |     source "${HOME}/.zsh-config.d/${file}" | ||||||
| done | done | ||||||
|  |  | ||||||
| log 1 "Checking for configuration consistency..." |  | ||||||
| for file in `find ${CONFIG_PATH}/zsh/defaults/ -maxdepth 1 -type f -exec basename {} \; | sort`; do |  | ||||||
|     if [ ! -f "${HOME}/.zsh-config.d/${file}" ]; then |  | ||||||
|         cp "${CONFIG_PATH}/zsh/defaults/${file}" "${HOME}/.zsh-config.d/${file}" |  | ||||||
|         log 0 "New configuration file '${file}' copied to your home directory (${HOME}/.zsh-config.d/)." |  | ||||||
|         log 0 "Don't forget to take a look and configure, if neccessary!" |  | ||||||
|     fi |  | ||||||
| done |  | ||||||
|   | |||||||
| @@ -1,5 +1,9 @@ | |||||||
| # Load enabled apps. | # Load enabled apps. | ||||||
| for app in ${ENABLED_APPS[@]}; do | for app in ${ENABLED_APPS[@]}; do | ||||||
|  |     if [ "${app}" = "" ]; then | ||||||
|  |       continue | ||||||
|  |     fi | ||||||
|  |  | ||||||
|     if [ ! -f "${CONFIG_PATH}/zsh/apps/${app}.app.zsh" ]; then |     if [ ! -f "${CONFIG_PATH}/zsh/apps/${app}.app.zsh" ]; then | ||||||
|         error 0 "Application '${app}' doesn't exist" |         error 0 "Application '${app}' doesn't exist" | ||||||
|     else |     else | ||||||
|   | |||||||
| @@ -1,5 +1,9 @@ | |||||||
| # Load enabled plugins. | # Load enabled plugins. | ||||||
| for plugin in "${ENABLED_PLUGINS[@]}"; do | for plugin in "${ENABLED_PLUGINS[@]}"; do | ||||||
|  |     if [ "${plugin}" = "" ]; then | ||||||
|  |       continue | ||||||
|  |     fi | ||||||
|  |  | ||||||
|     if [ ! -f "${CONFIG_PATH}/zsh/plugins/${plugin}.plugin.zsh" ]; then |     if [ ! -f "${CONFIG_PATH}/zsh/plugins/${plugin}.plugin.zsh" ]; then | ||||||
|         error 0 "Plugin '${plugin}' doesn't exist" |         error 0 "Plugin '${plugin}' doesn't exist" | ||||||
|     else |     else | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user