Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Remove $GITCMD variable #112

Merged
merged 2 commits into from

2 participants

@lurch

After commit c5d159c $GITCMD is only used once, so 'inline it', which also allows us to get rid of the 'eval' call.

@popcornmix
Collaborator

Needs rebase

@lurch

First time I've done a rebase - hopefully I've done it right!

@popcornmix
Collaborator

Not right. You've got 4 commits here. I don't believe the first are desired.

lurch added some commits
@lurch lurch Remove $GITCMD variable
After commit c5d159c $GITCMD is only used once, so 'inline it', which also allows us to get rid of the 'eval' call.
742f9a3
@lurch lurch rev-parse git command doesn't need the --work-tree argument
small tidyup
6f8dc5f
@lurch

Hopefully now sorted. Now I'm slowly getting to grips with git rebase, I could squash these commits together, if you'd prefer.

@popcornmix popcornmix merged commit 730661e into Hexxeh:master
@lurch lurch deleted the lurch:patch-4 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 1, 2013
  1. @lurch

    Remove $GITCMD variable

    lurch authored
    After commit c5d159c $GITCMD is only used once, so 'inline it', which also allows us to get rid of the 'eval' call.
  2. @lurch
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 2 deletions.
  1. +1 −2  rpi-update
View
3  rpi-update
@@ -25,7 +25,6 @@ FW_PATH="${BOOT_PATH}"
FW_MODPATH="${ROOT_PATH}/lib/modules"
FW_REV=${1:-""}
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
function update_self() {
@@ -107,7 +106,7 @@ function finalise {
ldconfig -r "${ROOT_PATH}"
if [[ ${FW_REV} == "" ]]; then
echo " *** Storing current firmware revision"
- eval ${GITCMD} rev-parse ${BRANCH} > "${FW_REVFILE}"
+ git --git-dir="${FW_REPOLOCAL}/.git" rev-parse ${BRANCH} > "${FW_REVFILE}"
else
echo ${FW_REV} > "${FW_REVFILE}"
fi
Something went wrong with that request. Please try again.