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

lower case

This commit is contained in:
Bob Mottram 2016-10-02 20:35:06 +01:00
parent 12a399d463
commit dd79c71468
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/freedombone-utils-filesystem
View File

@ -32,63 +32,63 @@ TOMB_REPO="https://github.com/dyne/Tomb"
TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1' TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1'
function mesh_install_tomb { function mesh_install_tomb {
chroot ${rootdir} apt-get -y install cryptsetup zsh pinentry-curses chroot ${rootdir} apt-get -y install cryptsetup zsh pinentry-curses
if [ ! -d ${rootdir}/$INSTALL_DIR ]; then if [ ! -d ${rootdir}/$INSTALL_DIR ]; then
mkdir -p ${rootdir}/$INSTALL_DIR mkdir -p ${rootdir}/$INSTALL_DIR
fi fi
git_clone $TOMB_REPO ${rootdir}/$INSTALL_DIR/tomb git_clone $TOMB_REPO ${rootdir}/$INSTALL_DIR/tomb
cd ${rootdir}/$INSTALL_DIR/tomb cd ${rootdir}/$INSTALL_DIR/tomb
git checkout $TOMB_COMMIT -b $TOMB_COMMIT git checkout $TOMB_COMMIT -b $TOMB_COMMIT
chroot ${rootdir} /bin/bash -x <<EOF chroot ${rootdir} /bin/bash -x <<EOF
cd $INSTALL_DIR/tomb cd $INSTALL_DIR/tomb
make install make install
EOF EOF
if [ ! -f ${rootdir}/usr/local/bin/tomb ]; then if [ ! -f ${rootdir}/usr/local/bin/tomb ]; then
exit 93462 exit 93462
fi fi
} }
function install_tomb { function install_tomb {
if [ $INSTALLING_MESH ]; then if [ $INSTALLING_MESH ]; then
mesh_install_tomb mesh_install_tomb
return return
fi fi
function_check set_repo_commit function_check set_repo_commit
set_repo_commit $INSTALL_DIR/tomb "Tomb commit" "$TOMB_COMMIT" $TOMB_REPO set_repo_commit $INSTALL_DIR/tomb "tomb commit" "$TOMB_COMMIT" $TOMB_REPO
if [ -f $COMPLETION_FILE ]; then if [ -f $COMPLETION_FILE ]; then
if grep -Fxq "install_tomb" $COMPLETION_FILE; then if grep -Fxq "install_tomb" $COMPLETION_FILE; then
return return
fi fi
fi fi
apt-get -y install cryptsetup zsh pinentry-curses apt-get -y install cryptsetup zsh pinentry-curses
if [ ! -d $INSTALL_DIR ]; then if [ ! -d $INSTALL_DIR ]; then
mkdir -p $INSTALL_DIR mkdir -p $INSTALL_DIR
fi fi
git_clone $TOMB_REPO $INSTALL_DIR/tomb git_clone $TOMB_REPO $INSTALL_DIR/tomb
cd $INSTALL_DIR/tomb cd $INSTALL_DIR/tomb
git checkout $TOMB_COMMIT -b $TOMB_COMMIT git checkout $TOMB_COMMIT -b $TOMB_COMMIT
if ! grep -q "Tomb commit" $COMPLETION_FILE; then if ! grep -q "tomb commit" $COMPLETION_FILE; then
echo "Tomb commit:$TOMB_COMMIT" >> $COMPLETION_FILE echo "tomb commit:$TOMB_COMMIT" >> $COMPLETION_FILE
else else
sed -i "s/Tomb commit.*/Tomb commit:$TOMB_COMMIT/g" $COMPLETION_FILE sed -i "s/tomb commit.*/tomb commit:$TOMB_COMMIT/g" $COMPLETION_FILE
fi fi
make install make install
if [ ! -f /usr/local/bin/tomb ]; then if [ ! -f /usr/local/bin/tomb ]; then
exit 93462 exit 93462
fi fi
echo 'install_tomb' >> $COMPLETION_FILE echo 'install_tomb' >> $COMPLETION_FILE
} }
# NOTE: deliberately no exit 0 # NOTE: deliberately no exit 0