free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include extra repos

This commit is contained in:
Bob Mottram 2017-06-15 12:43:52 +01:00
parent 67230ecaca
commit e65779aa0b
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/freedombone-image-customise
View File

@ -983,7 +983,16 @@ function image_install_inadyn {
mkdir -p $rootdir/root/build mkdir -p $rootdir/root/build
fi fi
chroot "$rootdir" apt-get -yq install build-essential curl libgnutls28-dev automake1.11 libconfuse-dev chroot "$rootdir" apt-get -yq install build-essential curl libgnutls28-dev automake1.11 libconfuse-dev
if [ -d /repos/inadyn ]; then
mkdir $rootdir/root/build/inadyn
cp -r -p /repos/inadyn/* $rootdir/root/build/inadyn
cd $rootdir/root/build/inadyn
git pull
else
git clone $INADYN_REPO $rootdir/root/build/inadyn git clone $INADYN_REPO $rootdir/root/build/inadyn
fi
if [ ! -d $rootdir/root/build/inadyn ]; then if [ ! -d $rootdir/root/build/inadyn ]; then
echo 'Failed to clone inadyn' echo 'Failed to clone inadyn'
exit 728252 exit 728252
@ -1225,6 +1234,8 @@ function image_preinstall_repos {
if [ ! -d $rootdir/repos ]; then if [ ! -d $rootdir/repos ]; then
mkdir $rootdir/repos mkdir $rootdir/repos
fi fi
git clone $CMAKE_REPO $rootdir/repos/cmake
git clone $INADYN_REPO $rootdir/repos/inadyn
git clone $CRYPTPAD_REPO $rootdir/repos/cryptpad git clone $CRYPTPAD_REPO $rootdir/repos/cryptpad
git clone $DOKUWIKI_REPO $rootdir/repos/dokuwiki git clone $DOKUWIKI_REPO $rootdir/repos/dokuwiki
git clone $ETHERPAD_REPO $rootdir/repos/etherpad git clone $ETHERPAD_REPO $rootdir/repos/etherpad

16
src/freedombone-utils-cmake
View File

@ -38,7 +38,15 @@ function mesh_install_cmake {
chroot "$rootdir" apt-get -yq install build-essential chroot "$rootdir" apt-get -yq install build-essential
if [ -d /repos/cmake ]; then
mkdir $rootdir$INSTALL_DIR/cmake
cp -r -p /repos/cmake/* $rootdir$INSTALL_DIR/cmake
cd $rootdir$INSTALL_DIR/cmake
git pull
else
git clone $CMAKE_REPO $rootdir$INSTALL_DIR/cmake git clone $CMAKE_REPO $rootdir$INSTALL_DIR/cmake
fi
cd $rootdir$INSTALL_DIR/cmake cd $rootdir$INSTALL_DIR/cmake
git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
@ -85,7 +93,15 @@ function install_cmake {
apt-get -yq install build-essential apt-get -yq install build-essential
if [ -d /repos/cmake ]; then
mkdir $INSTALL_DIR/cmake
cp -r -p /repos/cmake/* $INSTALL_DIR/cmake
cd $INSTALL_DIR/cmake
git pull
else
git_clone $CMAKE_REPO $INSTALL_DIR/cmake git_clone $CMAKE_REPO $INSTALL_DIR/cmake
fi
cd $INSTALL_DIR/cmake cd $INSTALL_DIR/cmake
git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
./bootstrap ./bootstrap

7
src/freedombone-utils-web
View File

@ -441,8 +441,15 @@ function install_dynamicdns {
apt-get -yq install build-essential curl libgnutls28-dev automake1.11 apt-get -yq install build-essential curl libgnutls28-dev automake1.11
if [ ! -d $INSTALL_DIR/inadyn ]; then if [ ! -d $INSTALL_DIR/inadyn ]; then
if [ -d /repos/inadyn ]; then
mkdir $INSTALL_DIR/inadyn
cp -r -p /repos/inadyn/* $INSTALL_DIR/inadyn
cd $INSTALL_DIR/inadyn
git pull
else
git_clone $INADYN_REPO $INSTALL_DIR/inadyn git_clone $INADYN_REPO $INSTALL_DIR/inadyn
fi fi
fi
if [ ! -d $INSTALL_DIR/inadyn ]; then if [ ! -d $INSTALL_DIR/inadyn ]; then
echo 'inadyn repo not cloned' echo 'inadyn repo not cloned'
echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs