From c3812ffd871e78159436e3842e77466262117ce6 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 15 Jun 2017 12:53:24 +0100 Subject: [PATCH] More repos included within image --- src/freedombone-image-customise | 1 + src/freedombone-utils-filesystem | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 588e206e..c74be5ae 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -1236,6 +1236,7 @@ function image_preinstall_repos { fi git clone $CMAKE_REPO $rootdir/repos/cmake git clone $INADYN_REPO $rootdir/repos/inadyn + git clone $TOMB_REPO $rootdir/repos/tomb git clone $CRYPTPAD_REPO $rootdir/repos/cryptpad git clone $DOKUWIKI_REPO $rootdir/repos/dokuwiki git clone $ETHERPAD_REPO $rootdir/repos/etherpad diff --git a/src/freedombone-utils-filesystem b/src/freedombone-utils-filesystem index 0724cfef..8183a924 100755 --- a/src/freedombone-utils-filesystem +++ b/src/freedombone-utils-filesystem @@ -38,7 +38,15 @@ function mesh_install_tomb { mkdir -p ${rootdir}/$INSTALL_DIR fi - git_clone $TOMB_REPO ${rootdir}/$INSTALL_DIR/tomb + if [ -d /repos/tomb ]; then + mkdir ${rootdir}/$INSTALL_DIR/tomb + cp -r -p /repos/tomb/* ${rootdir}/$INSTALL_DIR/tomb + cd ${rootdir}/$INSTALL_DIR/tomb + git pull + else + git_clone $TOMB_REPO ${rootdir}/$INSTALL_DIR/tomb + fi + cd ${rootdir}/$INSTALL_DIR/tomb git checkout $TOMB_COMMIT -b $TOMB_COMMIT @@ -73,7 +81,15 @@ function install_tomb { mkdir -p $INSTALL_DIR fi - git_clone $TOMB_REPO $INSTALL_DIR/tomb + if [ -d /repos/tomb ]; then + mkdir $INSTALL_DIR/tomb + cp -r -p /repos/tomb/* $INSTALL_DIR/tomb + cd $INSTALL_DIR/tomb + git pull + else + git_clone $TOMB_REPO $INSTALL_DIR/tomb + fi + cd $INSTALL_DIR/tomb git checkout $TOMB_COMMIT -b $TOMB_COMMIT