ソースを参照

Include extra repos

Bob Mottram 7 年 前
コミット
e65779aa0b
共有3 個のファイルを変更した38 個の追加4 個の削除を含む
  1. 12
    1
      src/freedombone-image-customise
  2. 18
    2
      src/freedombone-utils-cmake
  3. 8
    1
      src/freedombone-utils-web

+ 12
- 1
src/freedombone-image-customise ファイルの表示

983
         mkdir -p $rootdir/root/build
983
         mkdir -p $rootdir/root/build
984
     fi
984
     fi
985
     chroot "$rootdir" apt-get -yq install build-essential curl libgnutls28-dev automake1.11 libconfuse-dev
985
     chroot "$rootdir" apt-get -yq install build-essential curl libgnutls28-dev automake1.11 libconfuse-dev
986
-    git clone $INADYN_REPO $rootdir/root/build/inadyn
986
+
987
+    if [ -d /repos/inadyn ]; then
988
+        mkdir $rootdir/root/build/inadyn
989
+        cp -r -p /repos/inadyn/* $rootdir/root/build/inadyn
990
+        cd $rootdir/root/build/inadyn
991
+        git pull
992
+    else
993
+        git clone $INADYN_REPO $rootdir/root/build/inadyn
994
+    fi
995
+
987
     if [ ! -d $rootdir/root/build/inadyn ]; then
996
     if [ ! -d $rootdir/root/build/inadyn ]; then
988
         echo 'Failed to clone inadyn'
997
         echo 'Failed to clone inadyn'
989
         exit 728252
998
         exit 728252
1225
     if [ ! -d $rootdir/repos ]; then
1234
     if [ ! -d $rootdir/repos ]; then
1226
         mkdir $rootdir/repos
1235
         mkdir $rootdir/repos
1227
     fi
1236
     fi
1237
+    git clone $CMAKE_REPO $rootdir/repos/cmake
1238
+    git clone $INADYN_REPO $rootdir/repos/inadyn
1228
     git clone $CRYPTPAD_REPO $rootdir/repos/cryptpad
1239
     git clone $CRYPTPAD_REPO $rootdir/repos/cryptpad
1229
     git clone $DOKUWIKI_REPO $rootdir/repos/dokuwiki
1240
     git clone $DOKUWIKI_REPO $rootdir/repos/dokuwiki
1230
     git clone $ETHERPAD_REPO $rootdir/repos/etherpad
1241
     git clone $ETHERPAD_REPO $rootdir/repos/etherpad

+ 18
- 2
src/freedombone-utils-cmake ファイルの表示

38
 
38
 
39
     chroot "$rootdir" apt-get -yq install build-essential
39
     chroot "$rootdir" apt-get -yq install build-essential
40
 
40
 
41
-    git clone $CMAKE_REPO $rootdir$INSTALL_DIR/cmake
41
+    if [ -d /repos/cmake ]; then
42
+        mkdir $rootdir$INSTALL_DIR/cmake
43
+        cp -r -p /repos/cmake/* $rootdir$INSTALL_DIR/cmake
44
+        cd $rootdir$INSTALL_DIR/cmake
45
+        git pull
46
+    else
47
+        git clone $CMAKE_REPO $rootdir$INSTALL_DIR/cmake
48
+    fi
49
+
42
     cd $rootdir$INSTALL_DIR/cmake
50
     cd $rootdir$INSTALL_DIR/cmake
43
     git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
51
     git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
44
 
52
 
85
 
93
 
86
     apt-get -yq install build-essential
94
     apt-get -yq install build-essential
87
 
95
 
88
-    git_clone $CMAKE_REPO $INSTALL_DIR/cmake
96
+    if [ -d /repos/cmake ]; then
97
+        mkdir $INSTALL_DIR/cmake
98
+        cp -r -p /repos/cmake/* $INSTALL_DIR/cmake
99
+        cd $INSTALL_DIR/cmake
100
+        git pull
101
+    else
102
+        git_clone $CMAKE_REPO $INSTALL_DIR/cmake
103
+    fi
104
+
89
     cd $INSTALL_DIR/cmake
105
     cd $INSTALL_DIR/cmake
90
     git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
106
     git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
91
     ./bootstrap
107
     ./bootstrap

+ 8
- 1
src/freedombone-utils-web ファイルの表示

441
 
441
 
442
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
442
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
443
     if [ ! -d $INSTALL_DIR/inadyn ]; then
443
     if [ ! -d $INSTALL_DIR/inadyn ]; then
444
-        git_clone $INADYN_REPO $INSTALL_DIR/inadyn
444
+        if [ -d /repos/inadyn ]; then
445
+            mkdir $INSTALL_DIR/inadyn
446
+            cp -r -p /repos/inadyn/* $INSTALL_DIR/inadyn
447
+            cd $INSTALL_DIR/inadyn
448
+            git pull
449
+        else
450
+            git_clone $INADYN_REPO $INSTALL_DIR/inadyn
451
+        fi
445
     fi
452
     fi
446
     if [ ! -d $INSTALL_DIR/inadyn ]; then
453
     if [ ! -d $INSTALL_DIR/inadyn ]; then
447
         echo 'inadyn repo not cloned'
454
         echo 'inadyn repo not cloned'