Browse Source

More repos included within image

Bob Mottram 8 years ago
parent
commit
c3812ffd87
2 changed files with 19 additions and 2 deletions
  1. 1
    0
      src/freedombone-image-customise
  2. 18
    2
      src/freedombone-utils-filesystem

+ 1
- 0
src/freedombone-image-customise View File

@@ -1236,6 +1236,7 @@ function image_preinstall_repos {
1236 1236
     fi
1237 1237
     git clone $CMAKE_REPO $rootdir/repos/cmake
1238 1238
     git clone $INADYN_REPO $rootdir/repos/inadyn
1239
+    git clone $TOMB_REPO $rootdir/repos/tomb
1239 1240
     git clone $CRYPTPAD_REPO $rootdir/repos/cryptpad
1240 1241
     git clone $DOKUWIKI_REPO $rootdir/repos/dokuwiki
1241 1242
     git clone $ETHERPAD_REPO $rootdir/repos/etherpad

+ 18
- 2
src/freedombone-utils-filesystem View File

@@ -38,7 +38,15 @@ function mesh_install_tomb {
38 38
         mkdir -p ${rootdir}/$INSTALL_DIR
39 39
     fi
40 40
 
41
-    git_clone $TOMB_REPO ${rootdir}/$INSTALL_DIR/tomb
41
+    if [ -d /repos/tomb ]; then
42
+        mkdir ${rootdir}/$INSTALL_DIR/tomb
43
+        cp -r -p /repos/tomb/* ${rootdir}/$INSTALL_DIR/tomb
44
+        cd ${rootdir}/$INSTALL_DIR/tomb
45
+        git pull
46
+    else
47
+        git_clone $TOMB_REPO ${rootdir}/$INSTALL_DIR/tomb
48
+    fi
49
+
42 50
     cd ${rootdir}/$INSTALL_DIR/tomb
43 51
 
44 52
     git checkout $TOMB_COMMIT -b $TOMB_COMMIT
@@ -73,7 +81,15 @@ function install_tomb {
73 81
         mkdir -p $INSTALL_DIR
74 82
     fi
75 83
 
76
-    git_clone $TOMB_REPO $INSTALL_DIR/tomb
84
+    if [ -d /repos/tomb ]; then
85
+        mkdir $INSTALL_DIR/tomb
86
+        cp -r -p /repos/tomb/* $INSTALL_DIR/tomb
87
+        cd $INSTALL_DIR/tomb
88
+        git pull
89
+    else
90
+        git_clone $TOMB_REPO $INSTALL_DIR/tomb
91
+    fi
92
+
77 93
     cd $INSTALL_DIR/tomb
78 94
 
79 95
     git checkout $TOMB_COMMIT -b $TOMB_COMMIT