1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Description: Do not call git (not a repo).
--- a/build/make.sh
+++ b/build/make.sh
@@ -194,7 +194,7 @@
build_repo
cd ${BUILD_DIR}/DataTables
-
+
# git appears to have a bug whereby --quiet doesn't work immediately
# after files have been generated. Running twice fixes
git diff --quiet --exit-code
@@ -241,7 +241,7 @@
cd $BUILD_DIR
git clone https://github.com/DataTables/DataTables.git
cd - > /dev/null 2>&1
- else
+ else
echo_msg "Pulling latest changes for build repo from origin"
fi
@@ -374,13 +374,12 @@
"sync")
# Sanity check that the working branch is going to build correctly
- CURR_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
- if [ $SYNC_BRANCH != $CURR_BRANCH ]; then
- echo_error "Working branch ($CURR_BRANCH) is not the same as the script branch ($SYNC_BRANCH)"
- echo_error "Exiting..."
- exit
- fi
-
+# CURR_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+# if [ $SYNC_BRANCH != $CURR_BRANCH ]; then
+# echo_error "Working branch ($CURR_BRANCH) is not the same as the script branch ($SYNC_BRANCH)"
+# echo_error "Exiting..."
+# exit
+# fi
build_repo_sync
;;
|
