Skip to content

Commit 5dc4d77

Browse files
committed
Fixed bugs in packages
1 parent 6b60fdc commit 5dc4d77

8 files changed

+66
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v0.4.2 (29-05-2024)
4+
5+
- Fixed bugs in packages.
6+
37
## v0.4.1 (27-05-2024)
48

59
- Added templates for RISC-V devices.

CHANGELOG_ru.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Список изменений
22

3+
## v0.4.2 (29-05-2024)
4+
5+
- Исправлены ошибки в пакетах.
6+
37
## v0.4.1 (27-05-2024)
48

59
- Добавлены шаблоны для RISC-V устройств.

bashscript/installpackagedebugger.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ if [ -z $INSTALLPATH ]; then
2121
INSTALLPATH=/usr/share/vsdbg
2222
fi
2323

24+
# **************** definition of variables ****************
25+
declare ARCH_OS=$(uname -m) #aarch64, armv7l, x86_64 or riscv64
26+
27+
# requirements check
28+
if [ $ARCH_OS != "aarch64" ] && [ $ARCH_OS != "armv7l" ] \
29+
&& [ $ARCH_OS != "x86_64" ]; then
30+
echo "ERROR. Current OS architecture ${ARCH_OS} is not supported."
31+
exit 1;
32+
fi
33+
2434
export DEBIAN_FRONTEND="noninteractive"
2535

2636
sudo apt-get update

bashscript/installpackagedocker.sh

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,37 @@ if [ -z $USERNAME ]; then
1616
exit 1;
1717
fi
1818

19+
# **************** definition of variables ****************
20+
declare ARCH_OS=$(uname -m) #aarch64, armv7l, x86_64 or riscv64
21+
22+
# requirements check
23+
if [ $ARCH_OS != "aarch64" ] && [ $ARCH_OS != "armv7l" ] \
24+
&& [ $ARCH_OS != "x86_64" ]&& [ $ARCH_OS != "riscv64" ]; then
25+
echo "ERROR. Current OS architecture ${ARCH_OS} is not supported."
26+
exit 1;
27+
fi
28+
1929
export DEBIAN_FRONTEND="noninteractive"
2030

2131
sudo apt-get update
22-
sudo apt-get install -y curl
2332

2433
#install
25-
curl -fsSL https://get.docker.com -o get-docker.sh
26-
chmod +x get-docker.sh
27-
sudo ./get-docker.sh
34+
#for aarch64, armv7l, x86_64
35+
if [ $ARCH_OS == "aarch64" ] || [ $ARCH_OS == "armv7l" ] \
36+
|| [ $ARCH_OS == "x86_64" ]; then
37+
#install
38+
sudo apt-get install -y curl
39+
curl -fsSL https://get.docker.com -o get-docker.sh
40+
chmod +x get-docker.sh
41+
sudo ./get-docker.sh
42+
fi
43+
44+
#for riscv64
45+
if [ $ARCH_OS == "riscv64" ]; then
46+
#install
47+
sudo apt-get install -y docker.io
48+
fi
49+
2850
#removal of artifacts
2951
if [ -f /etc/apt/sources.list.d/docker.list ]; then
3052
#rm

bashscript/installpackagedotnetruntimes.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ if [ -z $INSTALLPATH ]; then
2626
INSTALLPATH=/usr/share/dotnet
2727
fi
2828

29+
# **************** definition of variables ****************
30+
declare ARCH_OS=$(uname -m) #aarch64, armv7l, x86_64 or riscv64
31+
32+
# requirements check
33+
if [ $ARCH_OS != "aarch64" ] && [ $ARCH_OS != "armv7l" ] \
34+
&& [ $ARCH_OS != "x86_64" ]; then
35+
echo "ERROR. Current OS architecture ${ARCH_OS} is not supported. For riscv64 architecture you can install .NET SDK 8.0"
36+
exit 1;
37+
fi
38+
2939
export DEBIAN_FRONTEND="noninteractive"
3040

3141
sudo apt-get update

bashscript/installpackagedotnetsdk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ sudo apt-get update
4646
sudo apt-get install -y wget
4747

4848
#for aarch64, armv7l, x86_64
49-
if [ $ARCH_OS == "aarch64" ] && [ $ARCH_OS == "armv7l" ] \
50-
&& [ $ARCH_OS == "x86_64" ]; then
49+
if [ $ARCH_OS == "aarch64" ] || [ $ARCH_OS == "armv7l" ] \
50+
|| [ $ARCH_OS == "x86_64" ]; then
5151
#install
5252
wget https://dot.net/v1/dotnet-install.sh
5353
sudo chmod +x dotnet-install.sh

bashscript/testpackagedocker.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ set -e #Exit immediately if a comman returns a non-zero status
77

88
echo "Run: testpackagedocker.sh"
99

10-
sudo systemctl status docker
10+
echo "----------------------"
1111
docker --version
12-
docker version
13-
sudo docker info
12+
echo "----------------------"
13+
sudo systemctl status docker
14+
sudo docker version
15+
16+
declare ARCH_OS=$(uname -m) #aarch64, armv7l, x86_64 or riscv64
17+
if [ $ARCH_OS != "riscv64" ]; then
18+
sudo docker info
19+
fi
1420

1521
echo "Successfully"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"icon": "assets/fastiot-logo-256.png",
66
"license": "LGPL-3.0-only",
77
"preview": true,
8-
"version": "0.4.1",
8+
"version": "0.4.2",
99
"publisher": "devdotnetorg",
1010
"private": "false",
1111
"identity": {

0 commit comments

Comments
 (0)