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

[db_set] Fixed value comparison because of now non-existent extra character from print_meta_mtag

Browse source
This commit is contained in:
ayakael 2018-12-30 09:17:31 -05:00
parent cfcd9fb697
commit a1be609425
No known key found for this signature in database
GPG key ID: 575626A4AE5F4026
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/db_set
View file

@ -32,7 +32,7 @@ db_set() {
# Defines what imageids are imported into database, as we're only going to act on those # Defines what imageids are imported into database, as we're only going to act on those
local FIELD="$(echo ${CONDITION} | cut -d'=' -f1 | awk '{print toupper($0)}')" local FIELD="$(echo ${CONDITION} | cut -d'=' -f1 | awk '{print toupper($0)}')"
local VALUE="$(echo ${CONDITION} | cut -d'=' -f2 | awk '{print toupper($0)}')" local VALUE="$(echo ${CONDITION} | cut -d'=' -f2 | awk '{print toupper($0)}')"
# Determines which IMAGEIDs present in the DB_FILE match the CONDITION # Determines which IMAGEIDs present in the DB_FILE match the CONDITION
local COUNT=1 local COUNT=1
local dbimageidList=$(awk 'BEGIN{FS="\t"}{if($1!="LAST_DEPLOY" && $1!="LAST_UPDATE" && $1!="REPO_ID" && $1!="REPO_VERSION" && $1!="null"){print $2}}' ${DB_FILE} | awk '!seen[$0]++') local dbimageidList=$(awk 'BEGIN{FS="\t"}{if($1!="LAST_DEPLOY" && $1!="LAST_UPDATE" && $1!="REPO_ID" && $1!="REPO_VERSION" && $1!="null"){print $2}}' ${DB_FILE} | awk '!seen[$0]++')
@ -42,7 +42,7 @@ db_set() {
local imageidList[${COUNT}]="$(basename -s .tags ${MATCH} 2>/dev/null)" local imageidList[${COUNT}]="$(basename -s .tags ${MATCH} 2>/dev/null)"
local COUNT=$(( ${COUNT} + 1 )) local COUNT=$(( ${COUNT} + 1 ))
done done
# Goes through imageidList to determine which TRACKID matches the CONDITION # Goes through imageidList to determine which TRACKID matches the CONDITION
for imageid in ${imageidList[@]}; do for imageid in ${imageidList[@]}; do
@ -53,10 +53,10 @@ db_set() {
local COUNT=1 local COUNT=1
while [[ ${COUNT} -le ${TOTALTRACKS} ]]; do while [[ ${COUNT} -le ${TOTALTRACKS} ]]; do
local TRACK_VALUE=$(print_meta_mtag "${GIT_DIR}/${imageid}.tags" ${COUNT} ${FIELD} | cut -d'=' -f2 | sed 's|.$||' | tr '[:lower:]' '[:upper:]') local TRACK_VALUE=$(print_meta_mtag "${GIT_DIR}/${imageid}.tags" ${COUNT} ${FIELD} | cut -d'=' -f2 | awk '{print toupper($0)}')
# If print_meta_mtag extract the same VALUE from FIELD as the CONDITION, the TRACKID of this TRACK is added into trackidList # If print_meta_mtag extract the same VALUE from FIELD as the CONDITION, the TRACKID of this TRACK is added into trackidList
if [[ "${TRACK_VALUE}" == "${VALUE}" ]]; then if [[ "${TRACK_VALUE}" == "${VALUE}" ]]; then
local TRACKID=$(print_meta_mtag "${GIT_DIR}/${imageid}.tags" ${COUNT} TRACKID | cut -d'=' -f2 | sed 's|.$||') local TRACKID=$(print_meta_mtag "${GIT_DIR}/${imageid}.tags" ${COUNT} TRACKID | cut -d'=' -f2 )
_msg ECHO "Track ${COUNT} of ${imageid} matches condition. Adding to trackidList" _msg ECHO "Track ${COUNT} of ${imageid} matches condition. Adding to trackidList"
local trackidList[${COUNT}]="${TRACKID}" local trackidList[${COUNT}]="${TRACKID}"
fi fi