|
@@ -32,25 +32,26 @@ CMAKE_REPO="https://github.com/Kitware/CMake"
|
32
|
32
|
CMAKE_COMMIT='d6734eeb875ceca5d810e829ca90541918dca2b4'
|
33
|
33
|
|
34
|
34
|
function mesh_install_cmake {
|
35
|
|
- if [ ! -d $rootdir$INSTALL_DIR ]; then
|
36
|
|
- chroot "$rootdir" mkdir -p $INSTALL_DIR
|
|
35
|
+ # shellcheck disable=SC2154
|
|
36
|
+ if [ ! -d "$rootdir$INSTALL_DIR" ]; then
|
|
37
|
+ chroot "$rootdir" mkdir -p "$INSTALL_DIR"
|
37
|
38
|
fi
|
38
|
39
|
|
39
|
40
|
chroot "$rootdir" apt-get -yq install build-essential
|
40
|
41
|
|
41
|
42
|
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
|
|
43
|
+ mkdir "$rootdir$INSTALL_DIR/cmake"
|
|
44
|
+ cp -r -p /repos/cmake/. "$rootdir$INSTALL_DIR/cmake"
|
|
45
|
+ cd "$rootdir$INSTALL_DIR/cmake" || exit 678346836
|
45
|
46
|
git pull
|
46
|
47
|
else
|
47
|
|
- git clone $CMAKE_REPO $rootdir$INSTALL_DIR/cmake
|
|
48
|
+ git clone "$CMAKE_REPO" "$rootdir$INSTALL_DIR/cmake"
|
48
|
49
|
fi
|
49
|
50
|
|
50
|
|
- cd $rootdir$INSTALL_DIR/cmake
|
|
51
|
+ cd "$rootdir$INSTALL_DIR/cmake" || exit 734634684
|
51
|
52
|
git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
|
52
|
53
|
|
53
|
|
- cat <<EOF > $rootdir/root/install_cmake
|
|
54
|
+ cat <<EOF > "$rootdir/root/install_cmake"
|
54
|
55
|
cd $INSTALL_DIR/cmake
|
55
|
56
|
./bootstrap
|
56
|
57
|
make
|
|
@@ -65,18 +66,17 @@ EOF
|
65
|
66
|
}
|
66
|
67
|
|
67
|
68
|
function install_cmake {
|
68
|
|
- if [ $INSTALLING_MESH ]; then
|
|
69
|
+ if [ "$INSTALLING_MESH" ]; then
|
69
|
70
|
mesh_install_cmake
|
70
|
71
|
return
|
71
|
72
|
fi
|
72
|
73
|
|
73
|
|
- if [ -d $INSTALL_DIR/cmake ]; then
|
74
|
|
- if ! grep -q "CMake commit:$CMAKE_COMMIT" $COMPLETION_FILE; then
|
75
|
|
- set_repo_commit $INSTALL_DIR/cmake "CMake commit" "$CMAKE_COMMIT" $CMAKE_REPO
|
76
|
|
- cd $INSTALL_DIR/cmake
|
|
74
|
+ if [ -d "$INSTALL_DIR/cmake" ]; then
|
|
75
|
+ if ! grep -q "CMake commit:$CMAKE_COMMIT" "$COMPLETION_FILE"; then
|
|
76
|
+ set_repo_commit "$INSTALL_DIR/cmake" "CMake commit" "$CMAKE_COMMIT" "$CMAKE_REPO"
|
|
77
|
+ cd "$INSTALL_DIR/cmake" || exit 36873638
|
77
|
78
|
./bootstrap
|
78
|
|
- make
|
79
|
|
- if [ ! "$?" = "0" ]; then
|
|
79
|
+ if ! make; then
|
80
|
80
|
exit 72581
|
81
|
81
|
fi
|
82
|
82
|
make install
|
|
@@ -87,26 +87,25 @@ function install_cmake {
|
87
|
87
|
return
|
88
|
88
|
fi
|
89
|
89
|
|
90
|
|
- if [ ! -d $INSTALL_DIR ]; then
|
91
|
|
- mkdir -p $INSTALL_DIR
|
|
90
|
+ if [ ! -d "$INSTALL_DIR" ]; then
|
|
91
|
+ mkdir -p "$INSTALL_DIR"
|
92
|
92
|
fi
|
93
|
93
|
|
94
|
94
|
apt-get -yq install build-essential
|
95
|
95
|
|
96
|
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
|
|
97
|
+ mkdir "$INSTALL_DIR/cmake"
|
|
98
|
+ cp -r -p /repos/cmake/. "$INSTALL_DIR/cmake"
|
|
99
|
+ cd "$INSTALL_DIR/cmake" || exit 374893758
|
100
|
100
|
git pull
|
101
|
101
|
else
|
102
|
|
- git_clone $CMAKE_REPO $INSTALL_DIR/cmake
|
|
102
|
+ git_clone "$CMAKE_REPO" "$INSTALL_DIR/cmake"
|
103
|
103
|
fi
|
104
|
104
|
|
105
|
|
- cd $INSTALL_DIR/cmake
|
106
|
|
- git checkout $CMAKE_COMMIT -b $CMAKE_COMMIT
|
|
105
|
+ cd "$INSTALL_DIR/cmake" || exit 3467384
|
|
106
|
+ git checkout "$CMAKE_COMMIT" -b "$CMAKE_COMMIT"
|
107
|
107
|
./bootstrap
|
108
|
|
- make
|
109
|
|
- if [ ! "$?" = "0" ]; then
|
|
108
|
+ if ! make; then
|
110
|
109
|
exit 72581
|
111
|
110
|
fi
|
112
|
111
|
make install
|