mirror of https://github.com/k3s-io/k3s
Make verify-godeps.sh easier to debug
This does 3 things: 1. env var to retain the /tmp/godep 2. env var to use a specified /tmp/godep 3. rework of preload-dep to support more non-github things, like go4.orgpull/6/head
parent
3fa44312ad
commit
57b12c9d09
|
@ -28,14 +28,17 @@ preload-dep() {
|
||||||
org="$1"
|
org="$1"
|
||||||
project="$2"
|
project="$2"
|
||||||
sha="$3"
|
sha="$3"
|
||||||
|
# project_dir ($4) is optional, if unset we will generate it
|
||||||
|
if [[ -z ${4:-} ]]; then
|
||||||
|
project_dir="${GOPATH}/src/${org}/${project}.git"
|
||||||
|
else
|
||||||
|
project_dir="${4}"
|
||||||
|
fi
|
||||||
|
|
||||||
org_dir="${GOPATH}/src/${org}"
|
echo "**HACK** preloading dep for ${org} ${project} at ${sha} into ${project_dir}"
|
||||||
mkdir -p "${org_dir}"
|
git clone "https://${org}/${project}" "${project_dir}" > /dev/null 2>&1
|
||||||
pushd "${org_dir}" > /dev/null
|
pushd "${project_dir}" > /dev/null
|
||||||
git clone "https://${org}/${project}.git" > /dev/null 2>&1
|
git checkout "${sha}"
|
||||||
pushd "${org_dir}/${project}" > /dev/null
|
|
||||||
git checkout "${sha}" > /dev/null 2>&1
|
|
||||||
popd > /dev/null
|
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,9 +53,17 @@ if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create a nice clean place to put our new godeps
|
if [[ -z ${TMP_GOPATH:-} ]]; then
|
||||||
_tmpdir="$(mktemp -d -t gopath.XXXXXX)"
|
# Create a nice clean place to put our new godeps
|
||||||
KEEP_TMP=false
|
_tmpdir="$(mktemp -d -t gopath.XXXXXX)"
|
||||||
|
else
|
||||||
|
# reuse what we might have saved previously
|
||||||
|
_tmpdir="${TMP_GOPATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z KEEP_TMP ]]; then
|
||||||
|
KEEP_TMP=false
|
||||||
|
fi
|
||||||
function cleanup {
|
function cleanup {
|
||||||
if [ "${KEEP_TMP}" == "true" ]; then
|
if [ "${KEEP_TMP}" == "true" ]; then
|
||||||
echo "Leaving ${_tmpdir} for you to examine or copy. Please delete it manually when finished. (rm -rf ${_tmpdir})"
|
echo "Leaving ${_tmpdir} for you to examine or copy. Please delete it manually when finished. (rm -rf ${_tmpdir})"
|
||||||
|
|
Loading…
Reference in New Issue