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

Remove '--quiet' and '-q' options to git and wget

Browse Source
This commit is contained in:
James Nylen
2012-10-24 15:01:54 +00:00
parent 7c81158c7b
commit 4c690228f7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rpi-update
View File

@@ -28,7 +28,7 @@ function update_self() {
echo "Performing self-update" echo "Performing self-update"
_tempFileName="$0.tmp" _tempFileName="$0.tmp"
if ! wget --quiet --output-document="${_tempFileName}" "${UPDATE_URI}"; then if ! wget --output-document="${_tempFileName}" "${UPDATE_URI}"; then
echo "Failed to download update for rpi-update!" echo "Failed to download update for rpi-update!"
echo "Make sure you have ca-certificates installed and that the time is set correctly" echo "Make sure you have ca-certificates installed and that the time is set correctly"
exit 1 exit 1
@@ -36,7 +36,7 @@ function update_self() {
OCTAL_MODE=$(stat -c '%a' "$0") OCTAL_MODE=$(stat -c '%a' "$0")
if ! chmod ${OCTAL_MODE} "${_tempFileName}" ; then if ! chmod ${OCTAL_MODE} "${_tempFileName}" ; then
echo "Failed: Error while trying to set mode on ${_tempFileName}" echo "Failed: Error while trying to set mode on ${_tempFileName}"
exit 1 exit 1
fi fi
@@ -107,7 +107,7 @@ function finalise {
function download_repo { function download_repo {
echo "Setting up firmware (this will take a few minutes)" echo "Setting up firmware (this will take a few minutes)"
mkdir -p "${FW_REPOLOCAL}" mkdir -p "${FW_REPOLOCAL}"
git clone "${FW_REPO}" "${FW_REPOLOCAL}" --depth=1 --quiet git clone "${FW_REPO}" "${FW_REPOLOCAL}" --depth=1
RETVAL=$? RETVAL=$?
if [[ ${RETVAL} -ne 0 ]]; then if [[ ${RETVAL} -ne 0 ]]; then
echo "Failed to download new firmware files" echo "Failed to download new firmware files"
@@ -117,15 +117,15 @@ function download_repo {
function update_repo { function update_repo {
echo "Updating firmware (this will take a few minutes)" echo "Updating firmware (this will take a few minutes)"
eval ${GITCMD} fetch --quiet eval ${GITCMD} fetch
RETVAL=$? RETVAL=$?
if [[ ${RETVAL} -ne 0 ]]; then if [[ ${RETVAL} -ne 0 ]]; then
echo "Failed to download updated firmware files" echo "Failed to download updated firmware files"
exit 1 exit 1
fi fi
eval ${GITCMD} reset --hard --quiet eval ${GITCMD} reset --hard
eval ${GITCMD} clean -f -d --quiet eval ${GITCMD} clean -f -d
eval ${GITCMD} merge origin/master -m "automerge" --quiet eval ${GITCMD} merge origin/master -m "automerge"
RETVAL=$? RETVAL=$?
if [[ ${RETVAL} -ne 0 ]]; then if [[ ${RETVAL} -ne 0 ]]; then
echo "Failed to download updated firmware files" echo "Failed to download updated firmware files"
@@ -156,7 +156,7 @@ function do_update {
function download_rev { function download_rev {
echo "Downloading specific firmware revision (this will take a few minutes)" echo "Downloading specific firmware revision (this will take a few minutes)"
mkdir -p "${FW_REPOLOCAL}" mkdir -p "${FW_REPOLOCAL}"
wget -q "${REPO_URI}/tarball/${FW_REV}" -O "${FW_REPOLOCAL}/${FW_REV}.tar.gz" wget "${REPO_URI}/tarball/${FW_REV}" -O "${FW_REPOLOCAL}/${FW_REV}.tar.gz"
tar xzf "${FW_REPOLOCAL}/${FW_REV}.tar.gz" -C "${FW_REPOLOCAL}" --strip-components=1 tar xzf "${FW_REPOLOCAL}/${FW_REV}.tar.gz" -C "${FW_REPOLOCAL}" --strip-components=1
rm "${FW_REPOLOCAL}/${FW_REV}.tar.gz" rm "${FW_REPOLOCAL}/${FW_REV}.tar.gz"
} }