Skip to content

Commit 59d7258

Browse files
committed
Updated installation script
1 parent ea598cd commit 59d7258

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

install.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ PROJECT_NAME="cpp_tests"
55
CMAKE_BUILD_DIR="$HOME/CMakeBuilds"
66
CMAKE_PROJECT_DIR="$CMAKE_BUILD_DIR/$PROJECT_NAME"
77

8-
if [ -e "$CMAKE_PROJECT_DIR" ]; then
9-
rm -rf "$CMAKE_PROJECT_DIR"
8+
if [ "x$SAVE_PREV" = "x" ]; then
9+
if [ -e "$CMAKE_PROJECT_DIR" ]; then
10+
rm -rf "$CMAKE_PROJECT_DIR"
11+
fi
1012
fi
1113

1214
EXEC_EXTENSION=".exe"
13-
EXEC_PATH="$CMAKE_PROJECT_DIR/Debug/$PROJECT_NAME$EXEC_EXTENSION"
15+
EXEC_PATH="$CMAKE_PROJECT_DIR/$PROJECT_NAME$EXEC_EXTENSION"
1416

1517
if [ "$OS_NAME" = "Linux" ]; then
1618
EXEC_EXTENSION=".run"
@@ -22,7 +24,7 @@ fi
2224

2325
EXEC_LINK_PATH="$HOME/$PROJECT_NAME$EXEC_EXTENSION"
2426

25-
if (cmake -S . -B "$CMAKE_PROJECT_DIR" -DCMAKE_BUILD_TYPE=Release && cmake --build "$CMAKE_PROJECT_DIR" --target "$PROJECT_NAME"); then
27+
if (cmake -S . -B "$CMAKE_PROJECT_DIR" -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" && cmake --build "$CMAKE_PROJECT_DIR" --target "$PROJECT_NAME"); then
2628
rm -f "$EXEC_LINK_PATH"
2729
ln -s "$EXEC_PATH" "$EXEC_LINK_PATH"
2830
echo ''
@@ -40,7 +42,7 @@ if (cmake -S . -B "$CMAKE_PROJECT_DIR" -DCMAKE_BUILD_TYPE=Release && cmake --bui
4042
COMMON_EXEC_PATH="$COMMON_PROJECT_DIR/bin/$PROJECT_NAME"
4143

4244
if [ "$CHOISE" = "y" ]; then
43-
sudo rm -f "$COMMON_LINK_PATH"
45+
sudo -S rm -f "$COMMON_LINK_PATH"
4446

4547
if (sudo ln -s "$EXEC_PATH" "$COMMON_LINK_PATH"); then
4648
if [ -e "$COMMON_PROJECT_DIR" ]; then
@@ -63,7 +65,12 @@ if (cmake -S . -B "$CMAKE_PROJECT_DIR" -DCMAKE_BUILD_TYPE=Release && cmake --bui
6365
fi
6466

6567
exit 0
66-
else024d1f50-bba3-4e7f-a124-32ab0f76a567
68+
elif (cd "$CMAKE_PROJECT_DIR" && "./$PROJECT_NAME$EXEC_EXTENSION" -h >/dev/null 2>/dev/null); then
69+
echo "Congratulations! $PROJECT_NAME was compiled successfully. But it is impossible to create a link to it - run it from $CMAKE_BUILD_DIR as .\\$PROJECT_NAME$EXEC_EXTENSION"
70+
echo ''
71+
cd "$CMAKE_PROJECT_DIR" && "./$PROJECT_NAME$EXEC_EXTENSION" -h
72+
exit 0
73+
else
6774
echo 'Oops! Could not execute the program.'
6875
exit 1
6976
fi

0 commit comments

Comments
 (0)