diff --git a/dev/build.sh b/dev/build.sh index dbbeb43d365..e84248da46c 100755 --- a/dev/build.sh +++ b/dev/build.sh @@ -134,8 +134,8 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then fi if [[ "${VSCODE_LATEST}" == "yes" ]]; then - jsonTmp=$( cat "upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' ) - echo "${jsonTmp}" > "upstream/${VSCODE_QUALITY}.json" && unset jsonTmp + jsonTmp=$( cat "./upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' ) + echo "${jsonTmp}" > "./upstream/${VSCODE_QUALITY}.json" && unset jsonTmp fi fi diff --git a/get_repo.sh b/get_repo.sh index 7ea05e00ef4..9d059aa3bde 100755 --- a/get_repo.sh +++ b/get_repo.sh @@ -9,13 +9,13 @@ if [[ "${CI_BUILD}" != "no" ]]; then fi if [[ -z "${RELEASE_VERSION}" ]]; then - if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "upstream/${VSCODE_QUALITY}.json" ]]; then + if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "./upstream/${VSCODE_QUALITY}.json" ]]; then echo "Retrieve lastest version" UPDATE_INFO=$( curl --silent --fail "https://update.code.visualstudio.com/api/update/darwin/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" ) else echo "Get version from ${VSCODE_QUALITY}.json" - MS_COMMIT=$( jq -r '.commit' "upstream/${VSCODE_QUALITY}.json" ) - MS_TAG=$( jq -r '.tag' "upstream/${VSCODE_QUALITY}.json" ) + MS_COMMIT=$( jq -r '.commit' "./upstream/${VSCODE_QUALITY}.json" ) + MS_TAG=$( jq -r '.tag' "./upstream/${VSCODE_QUALITY}.json" ) fi if [[ -z "${MS_COMMIT}" ]]; then diff --git a/update_upstream.sh b/update_upstream.sh index 6e2845477ee..eceff8b1130 100755 --- a/update_upstream.sh +++ b/update_upstream.sh @@ -12,8 +12,8 @@ if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRIS exit 0 fi -jsonTmp=$( cat "upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' ) -echo "${jsonTmp}" > "upstream/${VSCODE_QUALITY}.json" && unset jsonTmp +jsonTmp=$( cat "./upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' ) +echo "${jsonTmp}" > "./upstream/${VSCODE_QUALITY}.json" && unset jsonTmp git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com" git config user.name "${GITHUB_USERNAME} CI"