[parser] Fixed merge conflict

This commit is contained in:
ayakael 2018-05-04 12:33:10 -07:00
commit b55b55ce7b
No known key found for this signature in database
GPG key ID: 575626A4AE5F4026
3 changed files with 13 additions and 5 deletions

View file

@ -39,3 +39,7 @@
* Added help menu for fsck, update and deploy commands * Added help menu for fsck, update and deploy commands
* Fixed bug in nonexistent id test where non-standard rows would be tests on * Fixed bug in nonexistent id test where non-standard rows would be tests on
* Changed --git-dir option to not necessitate "=" sign when defining git directory * Changed --git-dir option to not necessitate "=" sign when defining git directory
### v0.2.5
* Fixed bug with command parser not parsing options correctly
* Fixed bug where deploy would fail with errors that didn't exist

View file

@ -62,8 +62,9 @@ cmd_deploy() {
[[ $? -ne 0 ]] && { _ansi up 2; echo -en '\033[K'; echo "[ ${COUNT} / ${#updateableidList[@]} ] ${imageid} could not be downloaded from server"; cat ${STDERR}; local ERR=true; continue; } [[ $? -ne 0 ]] && { _ansi up 2; echo -en '\033[K'; echo "[ ${COUNT} / ${#updateableidList[@]} ] ${imageid} could not be downloaded from server"; cat ${STDERR}; local ERR=true; continue; }
fi fi
deploy_cp "${GIT_DIR}" "${TARGET}" "${DB_FILE}" ${imageid} > ${STDERR} 2>&1 deploy_cp "${GIT_DIR}" "${TARGET}" "${DB_FILE}" ${imageid} > ${STDERR} 2>&1
[[ $? -ne 0 ]] && local CP_ERR=true
[[ "${GIT_GET}" == "true" ]] && git -C "${GIT_DIR}" annex drop ${imageid}.flac >/dev/null 2>&1 [[ "${GIT_GET}" == "true" ]] && git -C "${GIT_DIR}" annex drop ${imageid}.flac >/dev/null 2>&1
[[ $? -ne 0 ]] && { _ansi up 2; echo -en '\033[K'; echo "[ ${COUNT} / ${#updateableidList[@]} ] Copy of ${imageid} completed with errors"; cat ${STDERR}; local ERR=true; continue; } [[ "${CP_ERR}" == "true" ]] && { _ansi up 2; echo -en '\033[K'; echo "[ ${COUNT} / ${#updateableidList[@]} ] Copy of ${imageid} completed with errors"; cat ${STDERR}; local ERR=true; continue; }
fi fi

View file

@ -7,9 +7,9 @@
GIT_DIR="./" GIT_DIR="./"
#Recursive argument parser #Recursive argument parser
while [[ -z "${1}" ]]; do while true; do
case ${1} in case ${1} in
--help) --help)
shift shift
HELP="${1}" HELP="${1}"
[[ -z "${HELP}" ]] && HELP=general [[ -z "${HELP}" ]] && HELP=general
@ -25,7 +25,10 @@ while [[ -z "${1}" ]]; do
--git-dir) --git-dir)
shift shift
GIT_DIR="${1}" GIT_DIR="${1}"
shift ;;
*)
break
;; ;;
esac esac