From c5f11c934911e37e3eda73d54d17ea070d210b80 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 1 Jan 2019 19:07:31 +0000
Subject: [PATCH] Only wget if local files aren't available
---
src/freedombone-utils-flasher | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-utils-flasher b/src/freedombone-utils-flasher
index 9105e131a..9f0b4d15f 100755
--- a/src/freedombone-utils-flasher
+++ b/src/freedombone-utils-flasher
@@ -54,13 +54,24 @@ function beaglebone_flasher {
mkdir -p "$$rootdirEMMC_DIR"
fi
- if [ "$rootdir" ]; then
+ # shellcheck disable=SC2086
+ if [ -f ~/${PROJECT_NAME}/image_build/emmc_functions.sh ]; then
# shellcheck disable=SC2086
- chroot "$rootdir" $INSTALL_PACKAGES wget rsync
+ cp ~/${PROJECT_NAME}/image_build/emmc_functions.sh "$rootdir$EMMC_DIR/functions.sh"
else
- $INSTALL_PACKAGES wget rsync
+ if [ -f /root/${PROJECT_NAME}/image_build/emmc_functions.sh ]; then
+ # shellcheck disable=SC2086
+ cp /root/${PROJECT_NAME}/image_build/emmc_functions.sh "$rootdir$EMMC_DIR/functions.sh"
+ else
+ if [ "$rootdir" ]; then
+ # shellcheck disable=SC2086
+ chroot "$rootdir" $INSTALL_PACKAGES wget rsync
+ else
+ $INSTALL_PACKAGES wget rsync
+ fi
+ wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$rootdir$EMMC_DIR/functions.sh"
+ fi
fi
- wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$rootdir$EMMC_DIR/functions.sh"
if [ ! -f "$rootdir$EMMC_DIR/functions.sh" ]; then
exit 62
fi
--
GitLab