Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
k-rister committed Sep 3, 2024
1 parent 9976771 commit 1c27baf
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions bin/jqlib
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ function jq_update() {

TMP_FILE=${FILE}.tmp

set -x
jq . ${FILE} 1>&2
jq --indent 4 "$@" ${FILE} > ${TMP_FILE}
RC=$?

Expand All @@ -19,15 +17,11 @@ function jq_update() {
fi

mv ${TMP_FILE} ${FILE}
set +x
}

function jq_query() {
local FILE
FILE=${1}; shift

set -x
jq . ${FILE} 1>&2
jq -r "$@" ${FILE}
set +x
}
4 changes: 0 additions & 4 deletions bin/subprojects-install
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ for link in $(find subprojects -type l); do
fi
done
for subproject in "${!subprojects[@]}"; do
echo "Current subproject=${subproject}"
echo "Current contents of repos.json:"
jq . ${REPOS_FILE}

sp_type=$(jq -r --arg name "${subproject}" '.official[], .unofficial[] | select(.name == $name) | .type' ${REPOS_FILE})
sp_repository=$(jq -r --arg name "${subproject}" '.official[], .unofficial[] | select(.name == $name) | .repository' ${REPOS_FILE})
# sp_repository has two possible formats:
Expand Down
2 changes: 0 additions & 2 deletions crucible-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,6 @@ else
fi
$INSTALL_PATH/bin/subprojects-install $GIT_TAG >>"$GIT_INSTALL_LOG" 2>&1 ||
exit_error "Failed to execute crucible-project install, check $GIT_INSTALL_LOG for details" $EC_FAIL_INSTALL
echo "Current contents of repos.json:"
jq . ${INSTALL_PATH}/config/repos.json

SYSCONFIG_CRUCIBLE_ENGINE_REGISTRY="${CRUCIBLE_ENGINE_REGISTRY}"
SYSCONFIG_CRUCIBLE_ENGINE_AUTH=""
Expand Down

0 comments on commit 1c27baf

Please sign in to comment.