Skip to content

Commit

Permalink
testing
Browse files Browse the repository at this point in the history
  • Loading branch information
k-rister committed Sep 3, 2024
1 parent f32ab98 commit 6e63f83
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bin/jqlib
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function jq_update() {
REASON=${1}; shift

TMP_FILE=${FILE}.tmp

command -v jq
jq --indent 4 "$@" ${FILE} > ${TMP_FILE}
RC=$?

Expand Down
3 changes: 2 additions & 1 deletion crucible-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ function update_repos_config() {
BRANCH=${3}

REPO_FILE=${PATH}/config/repos.json

command -v jq
current_repo_location=$(jq_query ${REPO_FILE} '.official[] | select(.name == "crucible") | .repository')
if [ "${REPO}" != "${current_repo_location}" ]; then
jq_update ${REPO_FILE} repository --arg repository "${REPO}" '.official[] | select(.name == "crucible") |= (.repository = $repository)'
Expand Down Expand Up @@ -463,6 +463,7 @@ echo "Using Git branch: ${GIT_BRANCH}"
git clone $GIT_REPO $INSTALL_PATH > $GIT_INSTALL_LOG 2>&1 ||
exit_error "Failed to git clone $GIT_REPO, check $GIT_INSTALL_LOG for details" $EC_FAIL_CLONE
source ${INSTALL_PATH}/bin/jqlib
command -v jq
update_repos_config ${GIT_REPO} ${INSTALL_PATH} ${GIT_BRANCH}
if [ -n "${GIT_BRANCH}" ]; then
if pushd ${INSTALL_PATH} > /dev/null; then
Expand Down

0 comments on commit 6e63f83

Please sign in to comment.