@@ -38,18 +38,31 @@ function cleanup()
38
38
rm -rf $HOME /local/include/winpr
39
39
fi
40
40
}
41
-
41
+ function change_branch()
42
+ {
43
+ local REPO_PATH=$1
44
+ local BRANCH=$2
45
+ if [ ! -z " $BRANCH " ]; then
46
+ local current=` pwd`
47
+ cd $REPO_PATH
48
+ git checkout $BRANCH
49
+ cd $current
50
+ fi
51
+ }
42
52
function git_clone_pull()
43
53
{
44
54
local REPO_PATH=$1
45
55
local REPO_URL=$2
56
+ local BRANCH=$3
46
57
if [ -d " $REPO_PATH " ]; then
47
58
pushd .
48
59
cd $REPO_PATH
49
60
git pull
61
+ change_branch $REPO_PATH $BRANCH
50
62
popd
51
63
else
52
64
git clone $REPO_URL
65
+ change_branch $REPO_PATH $BRANCH
53
66
fi
54
67
}
55
68
@@ -224,7 +237,6 @@ git_clone_pull EHS https://github.com/cloudbase/EHS.git || { echo 'Unable to dow
224
237
cd EHS || exit 99
225
238
echo ' ---- Starting ehs build ----'
226
239
mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make || exit 4
227
- make || exit 4
228
240
echo ' ---- Finished building ehs ----'
229
241
if [[ $sudo_present -eq 1 ]]; then
230
242
echo ' sudo available. Please enter your password to install ehs: '
236
248
echo ' ---- Finished installing ehs ----'
237
249
cd ../.. || exit 99
238
250
echo ' ---- Checking out freerdp master ----'
239
- git_clone_pull FreeRDP https://github.com/FreeRDP/FreeRDP.git || { echo ' Unable to download FreeRDP from github ' ; exit 99; }
251
+ git_clone_pull FreeRDP https://github.com/FreeRDP/FreeRDP.git stable-1.1 || { echo ' Unable to download FreeRDP' ; exit 99; }
240
252
cd FreeRDP || exit 99
253
+ echo ' ---- Start installing freerdp ----'
241
254
mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. || exit 6
242
255
echo ' ---- Building freerdp ----'
243
256
make || exit 6
@@ -247,38 +260,40 @@ if [[ $sudo_present -eq 1 ]]; then
247
260
sudo make install || exit 7
248
261
if [ -d /etc/ld.so.conf.d ]; then
249
262
sudo touch /etc/ld.so.conf.d/freerdp.conf
250
- sudo echo ' /usr/lib/x86_64-linux-gnu' > /etc/ld.so.conf.d/freerdp.conf
263
+ echo ' /usr/lib/x86_64-linux-gnu' > ./freerdp.conf
264
+ sudo mv ./freerdp.conf /etc/ld.so.conf.d/
251
265
sudo ldconfig
252
266
fi
253
267
else
254
268
echo ' sudo command unavailable. Please enter root password to install freerdp'
255
269
su -c make install || exit 7
256
270
if [ -d /etc/ld.so.conf.d ]; then
257
271
su -c touch /etc/ld.so.conf.d/freerdp.conf
258
- su -c echo ' /usr/lib/x86_64-linux-gnu' > /etc/ld.so.conf.d/freerdp.conf
272
+ echo ' /usr/lib/x86_64-linux-gnu' > ./freerdp.conf
273
+ su -c mv ./freerdp.conf /etc/ld.so.conf.d/
259
274
su -c ldconfig
260
275
fi
261
276
fi
262
277
echo ' ---- Finished installing freerdp ----'
263
278
cd ../.. || exit 99
264
279
echo ' ---- Checking out casablanca master ----'
265
- git_clone_pull casablanca https://git01 .codeplex.com/casablanca || { echo ' Unable to download casablanca from codeplex' ; exit 99; }
266
- cd casablanca/Binaries/ Release$BITNESS / || exit 99
267
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../../Release || exit 8
280
+ git_clone_pull casablanca https://git .codeplex.com/casablanca || { echo ' Unable to download casablanca from codeplex' ; exit 99; }
281
+ cd casablanca/Release || exit 99
282
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . || exit 8
268
283
make || exit 8
269
- make test || exit 9
284
+ # make test || exit 9
270
285
if [[ $sudo_present -eq 1 ]]; then
271
286
echo ' sudo available. Please enter your password to install casablanca: '
272
287
sudo cp Binaries/libcpprest.so /usr/lib || exit 10
273
288
sudo ldconfig || exit 10
274
289
sudo mkdir -p /usr/include/casablanca || exit 10
275
- sudo cp -r ../../ Release/include/* /usr/include/casablanca || exit 10
290
+ sudo cp -r ../Release/include/* /usr/include/casablanca || exit 10
276
291
else
277
292
echo ' sudo command unavailable. Please enter root password to install casablanca'
278
293
su -c cp Binaries/libcpprest.so /usr/lib$BITNESS || exit 10
279
294
su -c ldconfig || exit 10
280
295
su -c mkdir -p /usr/include/casablanca || exit 10
281
- su -c cp -r ../../ Release/include/* /usr/include/casablanca || exit 10
296
+ su -c cp -r ../Release/include/* /usr/include/casablanca || exit 10
282
297
fi
283
298
echo ' ---- Going back to webconnect ----'
284
299
popd
0 commit comments