Added a new $WORK_PATH variable

Useful if you don't want to write files directly into /root
This commit is contained in:
Andrew Scheller
2013-09-01 16:52:06 +01:00
parent 2c61ad2663
commit 87044fbb40

View File

@@ -17,10 +17,11 @@ fi
BRANCH=${BRANCH:-"master"} BRANCH=${BRANCH:-"master"}
ROOT_PATH=${ROOT_PATH:-"/"} ROOT_PATH=${ROOT_PATH:-"/"}
BOOT_PATH=${BOOT_PATH:-"/boot"} BOOT_PATH=${BOOT_PATH:-"/boot"}
WORK_PATH=${WORK_PATH:-"${ROOT_PATH}/root"}
SKIP_KERNEL=${SKIP_KERNEL:-0} SKIP_KERNEL=${SKIP_KERNEL:-0}
RPI_UPDATE_UNSUPPORTED=${RPI_UPDATE_UNSUPPORTED:-0} RPI_UPDATE_UNSUPPORTED=${RPI_UPDATE_UNSUPPORTED:-0}
FW_REPO="${REPO_URI}.git" FW_REPO="${REPO_URI}.git"
FW_REPOLOCAL="${ROOT_PATH}/root/.rpi-firmware" FW_REPOLOCAL="${WORK_PATH}/.rpi-firmware"
FW_PATH="${BOOT_PATH}" FW_PATH="${BOOT_PATH}"
FW_MODPATH="${ROOT_PATH}/lib/modules" FW_MODPATH="${ROOT_PATH}/lib/modules"
FW_REV=${1:-""} FW_REV=${1:-""}
@@ -43,7 +44,7 @@ function update_self() {
exit 1 exit 1
fi fi
cat > /root/.updateScript.sh << EOF cat > "${WORK_PATH}/.updateScript.sh" << EOF
if mv "${_tempFileName}" "$0"; then if mv "${_tempFileName}" "$0"; then
rm -- "\$0" rm -- "\$0"
exec env UPDATE_SELF=0 /bin/bash "$0" "${FW_REV}" exec env UPDATE_SELF=0 /bin/bash "$0" "${FW_REV}"
@@ -53,7 +54,7 @@ function update_self() {
EOF EOF
echo " *** Relaunching after update" echo " *** Relaunching after update"
exec /bin/bash /root/.updateScript.sh exec /bin/bash "${WORK_PATH}/.updateScript.sh"
} }
function update_modules { function update_modules {