raspberrypi/rpi-update
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-update.git synced 2026-01-20 21:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211 from lurch/patch-1

Browse Source 
Skip asking github for latest hash, if we're requesting a specific hash
This commit is contained in:
popcornmix
2016-08-02 17:55:01 +01:00
committed by GitHub
parent b19779b2c8 e83878eeae
commit a05ee801c0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rpi-update
View File

@@ -376,16 +376,16 @@ command -v readelf >/dev/null 2>&1 || {
exit 1 exit 1
} }
# ask github for latest version hash
REPO_API=${REPO_URI/github.com/api.github.com\/repos}/git/refs/heads/${BRANCH}
GITREV=$(curl -Ls ${REPO_API} | awk '{ if ($1 == "\"sha\":") { print substr($2, 2, 40) } }')
FW_REV=${FW_REV:-${GITREV}}
if [[ "${FW_REV}" == "" ]]; then if [[ "${FW_REV}" == "" ]]; then
# ask github for latest version hash
REPO_API=${REPO_URI/github.com/api.github.com\/repos}/git/refs/heads/${BRANCH}
FW_REV=$(curl -Ls ${REPO_API} | awk '{ if ($1 == "\"sha\":") { print substr($2, 2, 40) } }')
if [[ "${FW_REV}" == "" ]]; then
echo " *** No hash received from github: ${REPO_API}" echo " *** No hash received from github: ${REPO_API}"
# run again with errors not suppressed # run again with errors not suppressed
curl -L ${REPO_API} curl -L ${REPO_API}
exit 1 exit 1
fi
fi fi
if [[ ! -f "${FW_REVFILE}" ]]; then if [[ ! -f "${FW_REVFILE}" ]]; then