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 $GITCMD variable

Browse Source 
After commit c5d159c $GITCMD is only used once, so 'inline it', which also allows us to get rid of the 'eval' call.
This commit is contained in:
Andrew Scheller
2013-08-26 20:19:25 +01:00
parent 5437dc0e03
commit 742f9a3c48
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rpi-update
View File

@@ -25,7 +25,6 @@ FW_PATH="${BOOT_PATH}"
FW_MODPATH="${ROOT_PATH}/lib/modules" FW_MODPATH="${ROOT_PATH}/lib/modules"
FW_REV=${1:-""} FW_REV=${1:-""}
FW_REVFILE="${FW_PATH}/.firmware_revision" FW_REVFILE="${FW_PATH}/.firmware_revision"
GITCMD="git --git-dir=\"${FW_REPOLOCAL}/.git\" --work-tree=\"${FW_REPOLOCAL}\""
[ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=0 ./rpi-update" && exit 1 [ "${RPI_UPDATE_UNSUPPORTED}" -ne 0 ] && echo -e "You appear to be trying to update firmware on an incompatible distribution. To force update, run the following:\nsudo -E RPI_UPDATE_UNSUPPORTED=0 ./rpi-update" && exit 1
function update_self() { function update_self() {
@@ -107,7 +106,7 @@ function finalise {
ldconfig -r "${ROOT_PATH}" ldconfig -r "${ROOT_PATH}"
if [[ ${FW_REV} == "" ]]; then if [[ ${FW_REV} == "" ]]; then
echo " *** Storing current firmware revision" echo " *** Storing current firmware revision"
eval ${GITCMD} rev-parse ${BRANCH} > "${FW_REVFILE}" git --git-dir="${FW_REPOLOCAL}/.git" --work-tree="${FW_REPOLOCAL}" rev-parse ${BRANCH} > "${FW_REVFILE}"
else else
echo ${FW_REV} > "${FW_REVFILE}" echo ${FW_REV} > "${FW_REVFILE}"
fi fi