diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2025-06-17 19:30:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-17 18:30:51 +0100 |
| commit | 03df00247115517db24816f00f90f01f0ef56cea (patch) | |
| tree | 8684c51f702a1ecf1d9fa634c197eb52627049df | |
| parent | d3cbce652d0fa30187a269cd0a264fe62107c299 (diff) | |
fix(bash): repository initialization bugs and update configurations (#22311)
| -rw-r--r-- | .editorconfig | 2 | ||||
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | .vscode/extensions.json | 1 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/debian.sh | 10 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/ubuntu.sh | 10 |
5 files changed, 23 insertions, 6 deletions
diff --git a/.editorconfig b/.editorconfig index 66e87791e3..b9d8a411b8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,7 @@ insert_final_newline = true trim_trailing_whitespace = true max_line_length = 80 -[*.{json,ts,js,yml}] +[*.{json,ts,js,yml,sh}] charset = utf-8 indent_style = space indent_size = 2 diff --git a/.gitignore b/.gitignore index 8d6ed8f648..548213a63f 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,12 @@ cmake-build-*/* coverage-report/ .vs +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + # # Eclipse # diff --git a/.vscode/extensions.json b/.vscode/extensions.json index a03767c6f8..28a4c8d3ff 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -5,7 +5,6 @@ "xaver.clang-format", "bbenoist.doxygen", "ms-vscode.cpptools", - "austin.code-gnu-global", "twxs.cmake", "mhutchie.git-graph", "github.vscode-pull-request-github", diff --git a/apps/installer/includes/os_configs/debian.sh b/apps/installer/includes/os_configs/debian.sh index da137922d4..4183925651 100644 --- a/apps/installer/includes/os_configs/debian.sh +++ b/apps/installer/includes/os_configs/debian.sh @@ -1,3 +1,7 @@ +#!/usr/bin/env bash + +CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if ! command -v lsb_release &>/dev/null ; then sudo apt-get install -y lsb-release fi @@ -22,8 +26,10 @@ sudo apt-get install -y gdbserver gdb unzip curl \ libssl-dev libbz2-dev \ libboost-all-dev gnupg wget +VAR_PATH="$CURRENT_PATH/../../../../var" + # run noninteractive install for MYSQL 8.4 LTS -wget https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb -sudo DEBIAN_FRONTEND="noninteractive" dpkg -i ./mysql-apt-config_0.8.32-1_all.deb +wget https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb -P "$VAR_PATH" +sudo DEBIAN_FRONTEND="noninteractive" dpkg -i "$VAR_PATH/mysql-apt-config_0.8.32-1_all.deb" sudo apt-get update sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server libmysqlclient-dev diff --git a/apps/installer/includes/os_configs/ubuntu.sh b/apps/installer/includes/os_configs/ubuntu.sh index 662458895b..02e6997ccd 100644 --- a/apps/installer/includes/os_configs/ubuntu.sh +++ b/apps/installer/includes/os_configs/ubuntu.sh @@ -1,3 +1,7 @@ +#!/usr/bin/env bash + +CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if ! command -v lsb_release &>/dev/null ; then sudo apt-get install -y lsb-release fi @@ -36,9 +40,11 @@ else libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \ libssl-dev + VAR_PATH="$CURRENT_PATH/../../../../var" + # run noninteractive install for MYSQL 8.4 LTS - wget https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb - sudo DEBIAN_FRONTEND="noninteractive" dpkg -i ./mysql-apt-config_0.8.32-1_all.deb + wget https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb -P "$VAR_PATH" + sudo DEBIAN_FRONTEND="noninteractive" dpkg -i "$VAR_PATH/mysql-apt-config_0.8.32-1_all.deb" sudo apt-get update sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server fi |