forge/dam
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

[cmd_*] Fixed typo with detection of git directory

Browse source 
[parser] Fixed bug with exit code detection
This commit is contained in:
ayakael 2018-04-07 21:18:44 -04:00
parent 0c22fcdf49
commit 87d8f8e167
No known key found for this signature in database
GPG key ID: 575626A4AE5F4026
7 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd_deploy
View file

@ -16,7 +16,7 @@ cmd_deploy() {
local ERR=false local ERR=false
local DB_FILE="${TARGET}/${_OPT_DB_FILE}" local DB_FILE="${TARGET}/${_OPT_DB_FILE}"
[[ ! -f "${DB_FILE}" ]] && return 1 [[ ! -f "${DB_FILE}" ]] && return 1
[[ ! -f "${GIT_DIR}/.git" ]] && return 2 [[ ! -d "${GIT_DIR}/.git" ]] && return 2
if [[ -z "$(grep LAST_DEPLOY ${DB_FILE})" ]]; then if [[ -z "$(grep LAST_DEPLOY ${DB_FILE})" ]]; then
echo -e "LAST_DEPLOY\t$(git -C "${GIT_DIR}" rev-list HEAD | tail -n 1)" >> ${DB_FILE} echo -e "LAST_DEPLOY\t$(git -C "${GIT_DIR}" rev-list HEAD | tail -n 1)" >> ${DB_FILE}

2
src/cmd_du
View file

@ -15,7 +15,7 @@ cmd_du() {
local TARGET="${2}" local TARGET="${2}"
local DB_FILE="${TARGET}/${_OPT_DB_FILE}" local DB_FILE="${TARGET}/${_OPT_DB_FILE}"
[[ ! -f "${DB_FILE}" ]] && return 1 [[ ! -f "${DB_FILE}" ]] && return 1
[[ ! -f "${GIT_DIR}/.git" ]] && return 2 [[ ! -d "${GIT_DIR}/.git" ]] && return 2
local imageidList=($(awk 'BEGIN{FS="\t"}{if($1=="true"){print $2}}' ${DB_FILE} | awk '!seen[$0]++')) local imageidList=($(awk 'BEGIN{FS="\t"}{if($1=="true"){print $2}}' ${DB_FILE} | awk '!seen[$0]++'))
local DU="$(print_imageid_du ${GIT_DIR} ${imageidList[@]})" local DU="$(print_imageid_du ${GIT_DIR} ${imageidList[@]})"

2
src/cmd_exclude
View file

@ -21,7 +21,7 @@ cmd_exclude() {
local DB_FILE="${TARGET}/${_OPT_DB_FILE}"; shift 2 local DB_FILE="${TARGET}/${_OPT_DB_FILE}"; shift 2
local conditionList=("${@}") local conditionList=("${@}")
[[ ! -f "${DB_FILE}" ]] && return 1 [[ ! -f "${DB_FILE}" ]] && return 1
[[ ! -f "${GIT_DIR}/.git" ]] && return 2 [[ ! -d "${GIT_DIR}/.git" ]] && return 2
for condition in ${conditionList[@]}; do for condition in ${conditionList[@]}; do
_msg EXEC "Excluding all tracks that match the following condition: ${condition}" _msg EXEC "Excluding all tracks that match the following condition: ${condition}"

2
src/cmd_fsck
View file

@ -15,7 +15,7 @@ cmd_fsck() {
local TARGET="${2}" local TARGET="${2}"
local DB_FILE="${TARGET}/${_OPT_DB_FILE}" local DB_FILE="${TARGET}/${_OPT_DB_FILE}"
[[ ! -f "${DB_FILE}" ]] && return 1 [[ ! -f "${DB_FILE}" ]] && return 1
[[ ! -f "${GIT_DIR}/.git" ]] && return 2 [[ ! -d "${GIT_DIR}/.git" ]] && return 2
chk_deployed_ids "${TARGET}" "${DB_FILE}" chk_deployed_ids "${TARGET}" "${DB_FILE}"
chk_nonexistent_ids "${TARGET}" "${DB_FILE}" chk_nonexistent_ids "${TARGET}" "${DB_FILE}"

2
src/cmd_include
View file

@ -21,7 +21,7 @@ cmd_include() {
local DB_FILE="${TARGET}/${_OPT_DB_FILE}"; shift 2 local DB_FILE="${TARGET}/${_OPT_DB_FILE}"; shift 2
local conditionList=("${@}") local conditionList=("${@}")
[[ ! -f "${DB_FILE}" ]] && return 1 [[ ! -f "${DB_FILE}" ]] && return 1
[[ ! -f "${GIT_DIR}/.git" ]] && return 2 [[ ! -d "${GIT_DIR}/.git" ]] && return 2
for condition in ${conditionList[@]}; do for condition in ${conditionList[@]}; do
_msg EXEC "Including all tracks that match the following condition: ${condition}" _msg EXEC "Including all tracks that match the following condition: ${condition}"

2
src/cmd_update
View file

@ -15,7 +15,7 @@ cmd_update() {
local TARGET="${2}" local TARGET="${2}"
local DB_FILE="${TARGET}/${_OPT_DB_FILE}" local DB_FILE="${TARGET}/${_OPT_DB_FILE}"
[[ ! -f "${DB_FILE}" ]] && return 1 [[ ! -f "${DB_FILE}" ]] && return 1
[[ ! -f "${GIT_DIR}/.git" ]] && return 2 [[ ! -d "${GIT_DIR}/.git" ]] && return 2
# In the event that LAST_COMMIT OR DB_FILE does not exist, echo out that the LAST_COMMIT # In the event that LAST_COMMIT OR DB_FILE does not exist, echo out that the LAST_COMMIT
# is the first COMMIT of GIT_DIR, thus stating that no database update has ever occured # is the first COMMIT of GIT_DIR, thus stating that no database update has ever occured

29
src/parser
View file

@ -27,7 +27,6 @@ while true; do
if [ -z "${1#*=}" ]; then if [ -z "${1#*=}" ]; then
help help
else else
log ECHO "--git-dir called. Git directory now defined as: ${1#*=}"
GIT_DIR="${1#*=}" GIT_DIR="${1#*=}"
fi fi
@ -46,41 +45,49 @@ case "${1}" in
exclude) exclude)
shift shift
cmd_exclude "${GIT_DIR}" ${@} cmd_exclude "${GIT_DIR}" ${@}
[[ $? -eq 1 ]] && echo "Database file non-existent" EXIT=$?
[[ $? -eq 2 ]] && echo "Git directory not a valid git repository" [[ ${EXIT} -eq 1 ]] && echo "Database file non-existent"
[[ ${EXIT} -eq 2 ]] && echo "Git directory not a valid git repository"
;; ;;
include) include)
shift shift
cmd_include$ "${GIT_DIR}" ${@} cmd_include$ "${GIT_DIR}" ${@}
[[ $? -eq 1 ]] && echo "Database file non-existent" EXIT=$?
[[ $? -eq 2 ]] && echo "Git directory not a valid git repository" [[ ${EXIT} -eq 1 ]] && echo "Database file non-existent"
[[ ${EXIT} -eq 2 ]] && echo "Git directory not a valid git repository"
;; ;;
deploy) deploy)
shift shift
cmd_deploy "${GIT_DIR}" ${@} cmd_deploy "${GIT_DIR}" ${@}
[[ $? -eq 1 ]] && echo "Database file non-existent" EXIT=$?
[[ $? -eq 2 ]] && echo "Git directory not a valid git repository" [[ ${EXIT} -eq 1 ]] && echo "Database file non-existent"
[[ ${EXIT} -eq 2 ]] && echo "Git directory not a valid git repository"
;; ;;
update) update)
shift shift
cmd_update "${GIT_DIR}" ${@} cmd_update "${GIT_DIR}" ${@}
[[ $? -eq 1 ]] && echo "Database file non-existent" EXIT=$?
[[ $? -eq 2 ]] && echo "Git directory not a valid git repository" [[ ${EXIT} -eq 1 ]] && echo "Database file non-existent"
[[ ${EXIT} -eq 2 ]] && echo "Git directory not a valid git repository"
;; ;;
du) du)
shift shift
cmd_du "${GIT_DIR}" "${@}" cmd_du "${GIT_DIR}" "${@}"
[[ $? -eq 1 ]] && echo "Database file non-existent" EXIT=$?
[[ $? -eq 2 ]] && echo "Git directory not a valid git repository" [[ ${EXIT} -eq 1 ]] && echo "Database file non-existent"
[[ ${EXIT} -eq 2 ]] && echo "Git directory not a valid git repository"
;; ;;
fsck) fsck)
shift shift
cmd_fsck "${GIT_DIR}" "${@}" cmd_fsck "${GIT_DIR}" "${@}"
EXIT=$?
[[ ${EXIT} -eq 1 ]] && echo "Database file non-existent"
[[ ${EXIT} -eq 2 ]] && echo "Git directory not a valid git repository"
;; ;;
esac esac